[tryton-debian-vcs] tryton-client branch upstream-3.8 updated. upstream/3.8.11-1-g22f5120
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon Dec 19 18:39:59 UTC 2016
The following commit has been merged in the upstream-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=upstream/3.8.11-1-g22f5120
commit 22f5120c17ead44bfe6c7bd1a203dc2695813f53
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 19 12:00:25 2016 +0100
Adding upstream version 3.8.12.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index a49ecb3..07b49a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.12 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.11 - 2016-11-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index c4bef8c..3f09f0e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.8.11
+Version: 3.8.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 c4bef8c..3f09f0e 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.8.11
+Version: 3.8.12
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 83ebbe6..5a6cf66 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.8.11"
+__version__ = "3.8.12"
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 0179c0a..b66414f 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -1317,7 +1317,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/data/locale/bg_BG/LC_MESSAGES/tryton.mo b/tryton/data/locale/bg_BG/LC_MESSAGES/tryton.mo
index c7f8e90..8eda13c 100644
Binary files a/tryton/data/locale/bg_BG/LC_MESSAGES/tryton.mo and b/tryton/data/locale/bg_BG/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ca_ES/LC_MESSAGES/tryton.mo b/tryton/data/locale/ca_ES/LC_MESSAGES/tryton.mo
index 6a538e3..a3822e7 100644
Binary files a/tryton/data/locale/ca_ES/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ca_ES/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/cs_CZ/LC_MESSAGES/tryton.mo b/tryton/data/locale/cs_CZ/LC_MESSAGES/tryton.mo
index b5cfaf4..22f6cbe 100644
Binary files a/tryton/data/locale/cs_CZ/LC_MESSAGES/tryton.mo and b/tryton/data/locale/cs_CZ/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/de_DE/LC_MESSAGES/tryton.mo b/tryton/data/locale/de_DE/LC_MESSAGES/tryton.mo
index f9d4ef2..1438920 100644
Binary files a/tryton/data/locale/de_DE/LC_MESSAGES/tryton.mo and b/tryton/data/locale/de_DE/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es_AR/LC_MESSAGES/tryton.mo b/tryton/data/locale/es_AR/LC_MESSAGES/tryton.mo
index bccc16c..59ecb74 100644
Binary files a/tryton/data/locale/es_AR/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es_AR/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es_CO/LC_MESSAGES/tryton.mo b/tryton/data/locale/es_CO/LC_MESSAGES/tryton.mo
index a1138ce..1250708 100644
Binary files a/tryton/data/locale/es_CO/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es_CO/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es_EC/LC_MESSAGES/tryton.mo b/tryton/data/locale/es_EC/LC_MESSAGES/tryton.mo
index 7420e38..6f79d9d 100644
Binary files a/tryton/data/locale/es_EC/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es_EC/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es_ES/LC_MESSAGES/tryton.mo b/tryton/data/locale/es_ES/LC_MESSAGES/tryton.mo
index 02d519f..2b04b59 100644
Binary files a/tryton/data/locale/es_ES/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es_ES/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es_MX/LC_MESSAGES/tryton.mo b/tryton/data/locale/es_MX/LC_MESSAGES/tryton.mo
index 450181e..2ad99aa 100644
Binary files a/tryton/data/locale/es_MX/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es_MX/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/fr_FR/LC_MESSAGES/tryton.mo b/tryton/data/locale/fr_FR/LC_MESSAGES/tryton.mo
index f23d85d..aba24bd 100644
Binary files a/tryton/data/locale/fr_FR/LC_MESSAGES/tryton.mo and b/tryton/data/locale/fr_FR/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo b/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo
index 097e1fb..659439b 100644
Binary files a/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo and b/tryton/data/locale/hu_HU/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo b/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo
index 5d9ae88..db52ee6 100644
Binary files a/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo and b/tryton/data/locale/it_IT/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo b/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo
index 099b8bc..1e595b1 100644
Binary files a/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ja_JP/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/lt_LT/LC_MESSAGES/tryton.mo b/tryton/data/locale/lt_LT/LC_MESSAGES/tryton.mo
index 0ad11d3..d0e597f 100644
Binary files a/tryton/data/locale/lt_LT/LC_MESSAGES/tryton.mo and b/tryton/data/locale/lt_LT/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/nl_NL/LC_MESSAGES/tryton.mo b/tryton/data/locale/nl_NL/LC_MESSAGES/tryton.mo
index ec3ea1f..288319c 100644
Binary files a/tryton/data/locale/nl_NL/LC_MESSAGES/tryton.mo and b/tryton/data/locale/nl_NL/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo b/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo
index f6c279f..eaab5d1 100644
Binary files a/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo and b/tryton/data/locale/pt_BR/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ru_RU/LC_MESSAGES/tryton.mo b/tryton/data/locale/ru_RU/LC_MESSAGES/tryton.mo
index 4546d03..64b9c51 100644
Binary files a/tryton/data/locale/ru_RU/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ru_RU/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/sl_SI/LC_MESSAGES/tryton.mo b/tryton/data/locale/sl_SI/LC_MESSAGES/tryton.mo
index 5484ceb..6424e57 100644
Binary files a/tryton/data/locale/sl_SI/LC_MESSAGES/tryton.mo and b/tryton/data/locale/sl_SI/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/gui/main.py b/tryton/gui/main.py
index 620aa7a..e576b24 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(
@@ -857,7 +858,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/shortcuts.py b/tryton/gui/window/shortcuts.py
index d89de2c..65b7ea6 100644
--- a/tryton/gui/window/shortcuts.py
+++ b/tryton/gui/window/shortcuts.py
@@ -69,8 +69,8 @@ class Shortcuts(object):
('+', _('Expand row')),
('-', _('Collapse row')),
('<Space>', _('Toggle row')),
- ('<Shift> + <Left>', _('Expand all rows')),
- ('<Shift> + <Right>', _('Collapse all rows')),
+ ('<Shift> + <Left>', _('Collapse all rows')),
+ ('<Shift> + <Right>', _('Expand all rows')),
]
notebook.append_page(self._fill_table(shortcuts),
gtk.Label(_('Tree view')))
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index e1a8dc9..6be52c6 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -755,8 +755,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 8cf96d2..2e2aaae 100644
--- a/tryton/gui/window/wizard.py
+++ b/tryton/gui/window/wizard.py
@@ -60,6 +60,7 @@ class Wizard(InfoBar):
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
More information about the tryton-debian-vcs
mailing list