[tryton-debian-vcs] tryton-client branch upstream-3.4 updated. upstream/3.4.11-1-g25d327b

[Mathias Behrle]

The following commit has been merged in the upstream-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=upstream/3.4.11-1-g25d327b

commit 25d327b3cabae67deb6dac49f09856ab3237645a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Sep 3 21:01:47 2016 +0200

    Adding upstream version 3.4.12.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 410cde9..87b7498 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.12 - 2016-09-03
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.11 - 2016-08-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index b692828..16c3c6b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.4.11
+Version: 3.4.12
 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 b692828..16c3c6b 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.11
+Version: 3.4.12
 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 ee454e0..5602382 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -572,12 +572,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/view_form/view/list_gtk/widget.py b/tryton/gui/window/view_form/view/list_gtk/widget.py
index c62da35..1585cf5 100644
--- a/tryton/gui/window/view_form/view/list_gtk/widget.py
+++ b/tryton/gui/window/view_form/view/list_gtk/widget.py
@@ -40,7 +40,12 @@ def send_keys(renderer, editable, position, treeview):
     editable.editing_done_id = editable.connect('editing_done',
             treeview.on_editing_done)
     if isinstance(editable, (gtk.ComboBoxEntry, gtk.ComboBox)):
-        editable.connect('changed', treeview.on_editing_done)
+        def changed(combobox):
+            # "changed" signal is also triggered by text editing
+            # so only trigger editing-done if a row is active
+            if combobox.get_active_iter():
+                treeview.on_editing_done(combobox)
+        editable.connect('changed', changed)
 
 
 def realized(func):
diff --git a/tryton/gui/window/wizard.py b/tryton/gui/window/wizard.py
index b46a700..8b0f9c7 100644
--- a/tryton/gui/window/wizard.py
+++ b/tryton/gui/window/wizard.py
@@ -323,12 +323,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 045ec55..adf3156 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.11"
+VERSION = "3.4.12"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client