[tryton-debian-vcs] tryton-client branch debian-jessie-3.4 updated. debian/3.4.14-1-2-g2af16f0

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Mon Dec 19 18:39:57 UTC 2016


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

commit 2af16f05563023d116177db75cb2b71683d36151
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:57:44 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index e764a3e..69b8d39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.4.15-1) unstable; urgency=medium
+
+  * Merging upstream version 3.4.15.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 19 Dec 2016 11:57:43 +0100
+
 tryton-client (3.4.14-1) unstable; urgency=medium
 
   * Merging upstream version 3.4.14.
commit 0026295ed5b4c7506361ae6d8dbf84fd1e23aa45
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:57:43 2016 +0100

    Merging upstream version 3.4.15.

diff --git a/CHANGELOG b/CHANGELOG
index bbdef66..e3cdbec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.15 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.14 - 2016-11-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 9541985..497a99b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.4.14
+Version: 3.4.15
 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 9541985..497a99b 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.14
+Version: 3.4.15
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 9dc829a..b4f8cbc 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -1356,7 +1356,10 @@ def RPCExecute(*args, **kwargs):
 def RPCContextReload(callback=None):
     def update(context):
         rpc.CONTEXT.clear()
-        rpc.CONTEXT.update(context())
+        try:
+            rpc.CONTEXT.update(context())
+        except RPCException:
+            pass
         if callback:
             callback()
     # Use RPCProgress to not send rpc.CONTEXT
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 4bfdc6a..05fc270 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -744,8 +744,9 @@ class O2MField(Field):
 
     def domain_get(self, record):
         screen_domain, attr_domain = self.domains_get(record)
-        return concat(localize_domain(inverse_leaf(screen_domain), self.name),
-            attr_domain)
+        # Forget screen_domain because it only means at least one record
+        # and not all records
+        return attr_domain
 
 
 class M2MField(O2MField):
diff --git a/tryton/gui/window/wizard.py b/tryton/gui/window/wizard.py
index 8b0f9c7..8c2b94f 100644
--- a/tryton/gui/window/wizard.py
+++ b/tryton/gui/window/wizard.py
@@ -59,6 +59,7 @@ class Wizard(object):
             try:
                 result = result()
             except RPCException:
+                self.destroy()
                 return
             self.session_id, self.start_state, self.end_state = result
             self.state = self.start_state
diff --git a/tryton/version.py b/tryton/version.py
index fbbd91e..798b140 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.14"
+VERSION = "3.4.15"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client



More information about the tryton-debian-vcs mailing list