[tryton-debian-vcs] tryton-client branch debian updated. debian/3.4.0-1-3-geb5879a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Dec 4 21:36:42 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.4.0-1-3-geb5879a
commit eb5879a950f4c09c5d9c369158b721320493b761
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Dec 4 18:05:20 2014 +0100
Releasing debian version 3.4.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 123a9ff..e191b42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-client (3.4.1-1) unstable; urgency=medium
+
+ * Merging upstream version 3.4.1.
+ * Refreshing 02-icon-directory.patch.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 04 Dec 2014 18:04:47 +0100
+
tryton-client (3.4.0-1) unstable; urgency=medium
* Merging upstream version 3.4.0.
commit 5a27968148492e7d4a3825b82540afe35dbceb5b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Dec 4 18:04:04 2014 +0100
Refreshing 02-icon-directory.patch.
diff --git a/debian/patches/02-icon-directory.patch b/debian/patches/02-icon-directory.patch
index 380081b..8152ae0 100644
--- a/debian/patches/02-icon-directory.patch
+++ b/debian/patches/02-icon-directory.patch
@@ -1,8 +1,8 @@
Author: Daniel Baumann <daniel at debian.org>
Description: Adjust icon directory to policy conforming place.
---- tryton-client.orig/setup.py 2014-10-21 17:51:19.213773579 +0200
-+++ tryton-client/setup.py 2014-10-21 17:51:19.213773579 +0200
+--- tryton-client.orig/setup.py 2014-12-04 17:59:04.257293779 +0100
++++ tryton-client/setup.py 2014-12-04 17:59:04.237293779 +0100
@@ -57,7 +57,7 @@
yield lang.split('_')[0]
@@ -12,12 +12,12 @@ Description: Adjust icon directory to policy conforming place.
glob.glob('share/pixmaps/tryton/*.svg')),
('share/locale', ['share/locale/tryton.pot']),
]
---- tryton-client.orig/tryton/config.py 2014-10-21 17:51:19.213773579 +0200
-+++ tryton-client/tryton/config.py 2014-10-21 17:57:06.569779197 +0200
+--- tryton-client.orig/tryton/config.py 2014-12-04 17:59:04.257293779 +0100
++++ tryton-client/tryton/config.py 2014-12-04 18:01:34.509296209 +0100
@@ -182,7 +182,7 @@
'..')))
- for dir in [CURRENT_DIR, site.USER_BASE, sys.prefix]:
+ for dir in [CURRENT_DIR, getattr(site, 'USER_BASE', sys.prefix), sys.prefix]:
- PIXMAPS_DIR = os.path.join(dir, 'share', 'pixmaps', 'tryton')
+ PIXMAPS_DIR = os.path.join(dir, 'share', 'icons', 'tryton')
if os.path.isdir(PIXMAPS_DIR):
commit 3a450c06fa429ecbb0a5f1b7fa2f94025cabc5cc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Dec 4 15:30:54 2014 +0100
Merging upstream version 3.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 26291ea..00f73a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2014-12-03
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
* Add DnD on export window
diff --git a/PKG-INFO b/PKG-INFO
index d23ca40..8ad641b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.4.0
+Version: 3.4.1
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index d23ca40..8ad641b 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.4.0
+Version: 3.4.1
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 03e65d1..2a3dfbd 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -1577,8 +1577,10 @@ with open(os.path.join(PIXMAPS_DIR, 'tryton-noimage.png'), 'rb') as no_image:
def data2pixbuf(data):
- try:
- pixbuf = _data2pixbuf(data)
- except glib.GError:
- pixbuf = NO_IMG_PIXBUF
+ pixbuf = NO_IMG_PIXBUF
+ if data:
+ try:
+ pixbuf = _data2pixbuf(data)
+ except glib.GError:
+ pass
return pixbuf
diff --git a/tryton/common/selection.py b/tryton/common/selection.py
index fe62052..fd0678c 100644
--- a/tryton/common/selection.py
+++ b/tryton/common/selection.py
@@ -198,6 +198,9 @@ class PopdownMixin(object):
if value:
return False
entry.set_active(active)
+ if active == -1:
+ # When setting no item GTK doesn't clear the entry
+ entry.child.set_text('')
return True
diff --git a/tryton/config.py b/tryton/config.py
index cbd13de..be3c9ed 100644
--- a/tryton/config.py
+++ b/tryton/config.py
@@ -181,7 +181,7 @@ else:
unicode(os.path.dirname(__file__), sys.getfilesystemencoding()),
'..')))
-for dir in [CURRENT_DIR, site.USER_BASE, sys.prefix]:
+for dir in [CURRENT_DIR, getattr(site, 'USER_BASE', sys.prefix), sys.prefix]:
PIXMAPS_DIR = os.path.join(dir, 'share', 'pixmaps', 'tryton')
if os.path.isdir(PIXMAPS_DIR):
break
diff --git a/tryton/gui/window/form.py b/tryton/gui/window/form.py
index e347dd8..0b1fce0 100644
--- a/tryton/gui/window/form.py
+++ b/tryton/gui/window/form.py
@@ -275,6 +275,7 @@ class Form(SignalEvent, TabContent):
revision = Revision(revisions, revision).run()
# Prevent too old revision in form view
if (self.screen.current_view.view_type == 'form'
+ and revision
and revision < revisions[-1][0]):
revision = revisions[-1][0]
if revision != self.screen.context.get('_datetime'):
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 24ae6aa..68c765d 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -673,7 +673,7 @@ class O2MField(Field):
fields = {}
to_remove = []
- for record2 in record.value[self.name]:
+ for record2 in record.value.get(self.name, []):
if not record2.id:
to_remove.append(record2)
if value and value.get('remove'):
diff --git a/tryton/gui/window/view_form/model/record.py b/tryton/gui/window/view_form/model/record.py
index e47cfb8..5751903 100644
--- a/tryton/gui/window/view_form/model/record.py
+++ b/tryton/gui/window/view_form/model/record.py
@@ -84,7 +84,7 @@ class Record(SignalEvent):
# Don't compute context for same group
or (record.context_get() == record_context)))
- if self.parent:
+ if self.parent and self.parent.model_name == self.model_name:
group = sum(self.parent.group.children, [])
filter_ = filter_parent_group
else:
diff --git a/tryton/gui/window/view_form/view/form_gtk/many2one.py b/tryton/gui/window/view_form/view/form_gtk/many2one.py
index 99a795f..7d051c1 100644
--- a/tryton/gui/window/view_form/view/form_gtk/many2one.py
+++ b/tryton/gui/window/view_form/view/form_gtk/many2one.py
@@ -52,7 +52,7 @@ class Many2One(Widget):
'tryton-find')
self.wid_text.connect('icon-press', self.sig_edit)
- self.widget.pack_start(self.wid_text, expand=True, fill=True)
+ self.widget.pack_end(self.wid_text, expand=True, fill=True)
self.widget.set_focus_chain([self.wid_text])
self._readonly = False
diff --git a/tryton/gui/window/view_form/view/form_gtk/one2many.py b/tryton/gui/window/view_form/view/form_gtk/one2many.py
index c4e644c..b7e3b64 100644
--- a/tryton/gui/window/view_form/view/form_gtk/one2many.py
+++ b/tryton/gui/window/view_form/view/form_gtk/one2many.py
@@ -301,7 +301,7 @@ class One2Many(Widget):
# New button must be added to focus chain to allow keyboard only
# creation when there is no existing record on form view.
- focus_chain = self.title_box.get_focus_chain()
+ focus_chain = self.title_box.get_focus_chain() or []
if o2m_size == 0 and self.screen.current_view.view_type == 'form':
if self.but_new not in focus_chain:
focus_chain.append(self.but_new)
diff --git a/tryton/version.py b/tryton/version.py
index 75b5c60..a83fcfa 100644
--- a/tryton/version.py
+++ b/tryton/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "tryton"
-VERSION = "3.4.0"
+VERSION = "3.4.1"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list