[tryton-debian-vcs] tryton-client branch debian updated. debian/4.0.3-1-2-gc0eb90d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Sep 4 16:52:18 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/4.0.3-1-2-gc0eb90d
commit c0eb90d48aca76316c74ca2ba5ddf495a687c711
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Sep 3 21:00:16 2016 +0200
Releasing debian version 4.0.4-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 0feaa13..8f6555d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (4.0.4-1) unstable; urgency=medium
+
+ * Merging upstream version 4.0.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 03 Sep 2016 21:00:16 +0200
+
tryton-client (4.0.3-1) unstable; urgency=medium
* Merging upstream version 4.0.3.
commit 4c56456a717dcc7ceb31719eda5a7bc6abd88063
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Sep 3 21:00:15 2016 +0200
Merging upstream version 4.0.4.
diff --git a/CHANGELOG b/CHANGELOG
index 024a531..4f73f40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.4 - 2016-09-03
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.3 - 2016-08-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index e3ade61..7ff04e3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.0.3
+Version: 4.0.4
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 e3ade61..7ff04e3 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.3
+Version: 4.0.4
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 6006d17..1f348d1 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.3"
+__version__ = "4.0.4"
diff --git a/tryton/config.py b/tryton/config.py
index 9be27a3..ce1b8d9 100644
--- a/tryton/config.py
+++ b/tryton/config.py
@@ -9,7 +9,6 @@ import logging
import sys
import locale
import gtk
-import pkg_resources
from tryton.exceptions import TrytonError
from tryton import __version__
@@ -178,6 +177,8 @@ elif (os.name == 'mac'
PIXMAPS_DIR = os.path.join(CURRENT_DIR, 'data', 'pixmaps', 'tryton')
if not os.path.isdir(PIXMAPS_DIR):
+ # do not import when frozen
+ import pkg_resources
PIXMAPS_DIR = pkg_resources.resource_filename(
'tryton', 'data/pixmaps/tryton')
diff --git a/tryton/data/locale/bg_BG/LC_MESSAGES/tryton.mo b/tryton/data/locale/bg_BG/LC_MESSAGES/tryton.mo
index ad48318..a261934 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 512981b..9ae486c 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 c6dc461..b8ca829 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 6c639ee..8e5c89f 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 741384d..2fe7514 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 f0e9af0..b5fcb8e 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 335c0a9..7f6b364 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 75cf1a8..4ecd38c 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 4cefcf7..db46396 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 b16d063..613d26b 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 32fa4fe..7afd2e0 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 661b1b3..4124632 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 1a2c6f8..a50090b 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 52b3bff..cca5110 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 5611026..d417c81 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 42be339..160544f 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 a420ca1..abc168a 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 c43b861..b093f0f 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 74a547c..fa37e2d 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 10d4cdc..85b3826 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/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index c9038b2..a17623e 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -583,12 +583,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 and '.' not in f)
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 0f15382..fe740e6 100644
--- a/tryton/gui/window/view_form/view/list_gtk/widget.py
+++ b/tryton/gui/window/view_form/view/list_gtk/widget.py
@@ -39,7 +39,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 1ab35f2..5085335 100644
--- a/tryton/gui/window/wizard.py
+++ b/tryton/gui/window/wizard.py
@@ -322,12 +322,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 ee7288c..98d6619 100644
--- a/tryton/rpc.py
+++ b/tryton/rpc.py
@@ -66,7 +66,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/translate.py b/tryton/translate.py
index 5303773..3ed4df8 100644
--- a/tryton/translate.py
+++ b/tryton/translate.py
@@ -7,7 +7,6 @@ import gettext
import logging
import gtk
import sys
-import pkg_resources
from tryton.config import CURRENT_DIR
@@ -156,6 +155,8 @@ def setlang(lang=None, locale_dict=None):
"Set language"
locale_dir = os.path.join(CURRENT_DIR, 'data/locale')
if not os.path.isdir(locale_dir):
+ # do not import when frozen
+ import pkg_resources
locale_dir = pkg_resources.resource_filename(
'tryton', 'data/locale')
if lang:
--
tryton-client
More information about the tryton-debian-vcs
mailing list