[tryton-debian-vcs] tryton-client branch debian-stretch-3.6 updated. debian/3.6.13-1-2-g8dbcabf

[Mathias Behrle]

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

commit 8dbcabff043be190462467b3dc5ce6e21cdddcc3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:59:06 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 7a94ff4..7b507c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.6.14-1) unstable; urgency=medium
+
+  * Merging upstream version 3.6.14.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 19 Dec 2016 11:59:06 +0100
+
 tryton-client (3.6.13-1) unstable; urgency=medium
 
   * Merging upstream version 3.6.13.
commit dbbb9c9a27a43f8f4f613a3c4bb8f17cbe258fef
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:59:05 2016 +0100

    Merging upstream version 3.6.14.

diff --git a/CHANGELOG b/CHANGELOG
index 6b6c247..b2e68c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.14 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.13 - 2016-11-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 6d0dac9..77c4282 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.13
+Version: 3.6.14
 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 6d0dac9..77c4282 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.6.13
+Version: 3.6.14
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 07e0435..2767f2e 100644
--- a/tryton/__init__.py
+++ b/tryton/__init__.py
@@ -1,3 +1,3 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-__version__ = "3.6.13"
+__version__ = "3.6.14"
diff --git a/tryton/common/common.py b/tryton/common/common.py
index ab13300..6671506 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -1336,7 +1336,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/main.py b/tryton/gui/main.py
index e731944..dcf4b0c 100644
--- a/tryton/gui/main.py
+++ b/tryton/gui/main.py
@@ -283,6 +283,7 @@ class Main(object):
 
     def set_global_search(self):
         self.global_search_entry = PlaceholderEntry()
+        self.global_search_entry.set_placeholder_text(_('Search'))
         global_search_completion = gtk.EntryCompletion()
         global_search_completion.set_match_func(lambda *a: True)
         global_search_completion.set_model(gtk.ListStore(
@@ -847,7 +848,8 @@ class Main(object):
                     self.favorite_unset()
                 CONFIG['client.lang'] = prefs['language']
             # Set placeholder after language is set to get correct translation
-            self.global_search_entry.set_placeholder_text(_('Search'))
+            if self.global_search_entry:
+                self.global_search_entry.set_placeholder_text(_('Search'))
             CONFIG.save()
 
         def _get_preferences():
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 0bbc0f8..5e38a0d 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -753,8 +753,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 288ae4f..7a91a2e 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
-- 
tryton-client