[tryton-debian-vcs] tryton-client branch debian-jessie-3.2 updated. debian/3.2.16-1-2-g9596735

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Sun Sep 4 16:52:31 UTC 2016


The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.2.16-1-2-g9596735

commit 95967354230a53fd563c21e1c13406e25f804417
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Sep 3 21:00:24 2016 +0200

    Releasing debian version 3.2.17-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 67dfe1d..919c88a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.2.17-1) unstable; urgency=medium
+
+  * Merging upstream version 3.2.17.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 03 Sep 2016 21:00:24 +0200
+
 tryton-client (3.2.16-1) unstable; urgency=medium
 
   * Merging upstream version 3.2.16.
commit a666712c5e18086f9585f45184d736b0a539ff5e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Sep 3 21:00:23 2016 +0200

    Merging upstream version 3.2.17.

diff --git a/CHANGELOG b/CHANGELOG
index ac22585..87814ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.17 - 2016-09-03
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.16 - 2016-08-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index c6b3239..d1a209f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.2.16
+Version: 3.2.17
 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 c6b3239..d1a209f 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.2.16
+Version: 3.2.17
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 068084c..b6f547e 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -591,12 +591,14 @@ class O2MField(Field):
     def _set_value(self, record, value, default=False):
         self._set_default_value(record)
         group = record.value[self.name]
-        if not value or (len(value) and isinstance(value[0], (int, long))):
+        if not value:
+            return
+        if isinstance(value[0], (int, long)):
             mode = 'list ids'
         else:
             mode = 'list values'
 
-        if mode == 'list values' and len(value):
+        if mode == 'list values':
             context = self.context_get(record)
             field_names = set(f for v in value for f in v
                 if f not in group.fields)
diff --git a/tryton/gui/window/wizard.py b/tryton/gui/window/wizard.py
index 398138b..9a323e7 100644
--- a/tryton/gui/window/wizard.py
+++ b/tryton/gui/window/wizard.py
@@ -320,12 +320,14 @@ class WizardDialog(Wizard, NoModal):
         return button
 
     def update(self, view, defaults, buttons):
-        super(WizardDialog, self).update(view, defaults, buttons)
+        # Dialog must be shown before the screen is displayed
+        # to get the treeview realized when displayed
         sensible_allocation = self.sensible_widget.get_allocation()
         self.dia.set_default_size(int(sensible_allocation.width * 0.9),
             int(sensible_allocation.height * 0.9))
         self.dia.show()
         common.center_window(self.dia, self.parent, self.sensible_widget)
+        super(WizardDialog, self).update(view, defaults, buttons)
 
     def destroy(self, action=None):
         super(WizardDialog, self).destroy()
diff --git a/tryton/rpc.py b/tryton/rpc.py
index b0af1a4..af669d2 100644
--- a/tryton/rpc.py
+++ b/tryton/rpc.py
@@ -68,7 +68,7 @@ def server_version(host, port):
         logging.getLogger(__name__).debug(repr(result))
         return result
     except (Fault, socket.error):
-        raise
+        return None
 
 
 def login(username, password, host, port, database):
diff --git a/tryton/version.py b/tryton/version.py
index 1ff48e3..5be4a01 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.2.16"
+VERSION = "3.2.17"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client



More information about the tryton-debian-vcs mailing list