[tryton-debian-vcs] tryton-client branch upstream-4.0 updated. upstream/4.0.6-1-g31c4204
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-4.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=upstream/4.0.6-1-g31c4204
commit 31c4204f79932d75a24d83f0e0633c719bb6b468
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 19 12:00:32 2016 +0100
Adding upstream version 4.0.7.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 26f62c7..d9f1365 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.7 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.6 - 2016-11-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index d9105d7..d664d7f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.0.6
+Version: 4.0.7
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 d9105d7..d664d7f 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.0.6
+Version: 4.0.7
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 0f6c404..6394e6a 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__ = "4.0.6"
+__version__ = "4.0.7"
diff --git a/tryton/common/common.py b/tryton/common/common.py
index fd9696e..d5b3c1f 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -1308,7 +1308,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 2bb6c16..efc4f11 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 26d80aa..3790983 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 d23be4d..ca54b65 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 2f2dded..ecd5c5e 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 a71a3cc..c5cdc20 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 0de3ec0..767c23f 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 b91cae1..128f0a8 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 7e46013..53bc5fe 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 93d2028..d5e0379 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 018b3b7..b55a987 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 1569ab4..4435a64 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 f561b42..99ec0b9 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 85f59a4..43d126a 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/lo_LA/LC_MESSAGES/tryton.mo b/tryton/data/locale/lo_LA/LC_MESSAGES/tryton.mo
index 955062a..7938e69 100644
Binary files a/tryton/data/locale/lo_LA/LC_MESSAGES/tryton.mo and b/tryton/data/locale/lo_LA/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 fde7fa2..cb7d689 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 491b08b..08c65f3 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 98d17d6..2112f9e 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 66d245d..f31c57b 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 cc9a76e..b0c108d 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/data/locale/zh_CN/LC_MESSAGES/tryton.mo b/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo
index 104411e..ea01fb6 100644
Binary files a/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo and b/tryton/data/locale/zh_CN/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/gui/main.py b/tryton/gui/main.py
index 8623d92..838215b 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 cff6894..e3290a4 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -758,8 +758,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 5085335..17c77d8 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