[tryton-debian-vcs] tryton-client branch debian-stretch-3.6 updated. debian/3.6.18-1-2-gda4478f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 5 12:21:52 UTC 2017
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.18-1-2-gda4478f
commit da4478f0c9459e8dec533c47e730d7114b334e3a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 5 11:52:43 2017 +0200
Releasing debian version 3.6.19-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 970d9df..c828179 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.6.19-1) unstable; urgency=medium
+
+ * Merging upstream version 3.6.19.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 05 Oct 2017 11:52:43 +0200
+
tryton-client (3.6.18-1) unstable; urgency=medium
* Merging upstream version 3.6.18.
commit 79c65f7718d6afdfa35adef932d858d0ac6e3824
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 5 11:52:43 2017 +0200
Merging upstream version 3.6.19.
diff --git a/CHANGELOG b/CHANGELOG
index f18c1ea..b2a3e07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.19 - 2017-10-03
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.18 - 2017-08-08
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 100c909..ec89304 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.6.18
+Version: 3.6.19
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/share/locale/bg_BG/LC_MESSAGES/tryton.mo b/share/locale/bg_BG/LC_MESSAGES/tryton.mo
index 90a3a2c..387d4aa 100644
Binary files a/share/locale/bg_BG/LC_MESSAGES/tryton.mo and b/share/locale/bg_BG/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/ca_ES/LC_MESSAGES/tryton.mo b/share/locale/ca_ES/LC_MESSAGES/tryton.mo
index fa90b75..dea51f1 100644
Binary files a/share/locale/ca_ES/LC_MESSAGES/tryton.mo and b/share/locale/ca_ES/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/cs_CZ/LC_MESSAGES/tryton.mo b/share/locale/cs_CZ/LC_MESSAGES/tryton.mo
index 107d731..92033a2 100644
Binary files a/share/locale/cs_CZ/LC_MESSAGES/tryton.mo and b/share/locale/cs_CZ/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/de_DE/LC_MESSAGES/tryton.mo b/share/locale/de_DE/LC_MESSAGES/tryton.mo
index 604d960..9f88624 100644
Binary files a/share/locale/de_DE/LC_MESSAGES/tryton.mo and b/share/locale/de_DE/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/es_AR/LC_MESSAGES/tryton.mo b/share/locale/es_AR/LC_MESSAGES/tryton.mo
index 687b683..2754cd4 100644
Binary files a/share/locale/es_AR/LC_MESSAGES/tryton.mo and b/share/locale/es_AR/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/es_CO/LC_MESSAGES/tryton.mo b/share/locale/es_CO/LC_MESSAGES/tryton.mo
index 409b945..c3531fd 100644
Binary files a/share/locale/es_CO/LC_MESSAGES/tryton.mo and b/share/locale/es_CO/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/es_EC/LC_MESSAGES/tryton.mo b/share/locale/es_EC/LC_MESSAGES/tryton.mo
index 2f1a6cd..688d221 100644
Binary files a/share/locale/es_EC/LC_MESSAGES/tryton.mo and b/share/locale/es_EC/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/es_ES/LC_MESSAGES/tryton.mo b/share/locale/es_ES/LC_MESSAGES/tryton.mo
index f7068be..4430a08 100644
Binary files a/share/locale/es_ES/LC_MESSAGES/tryton.mo and b/share/locale/es_ES/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/fr_FR/LC_MESSAGES/tryton.mo b/share/locale/fr_FR/LC_MESSAGES/tryton.mo
index f753a2e..61ce460 100644
Binary files a/share/locale/fr_FR/LC_MESSAGES/tryton.mo and b/share/locale/fr_FR/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/ja_JP/LC_MESSAGES/tryton.mo b/share/locale/ja_JP/LC_MESSAGES/tryton.mo
index 86972f2..d317e58 100644
Binary files a/share/locale/ja_JP/LC_MESSAGES/tryton.mo and b/share/locale/ja_JP/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/lt_LT/LC_MESSAGES/tryton.mo b/share/locale/lt_LT/LC_MESSAGES/tryton.mo
index 278c540..8742c3b 100644
Binary files a/share/locale/lt_LT/LC_MESSAGES/tryton.mo and b/share/locale/lt_LT/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/nl_NL/LC_MESSAGES/tryton.mo b/share/locale/nl_NL/LC_MESSAGES/tryton.mo
index fb49548..91f23b3 100644
Binary files a/share/locale/nl_NL/LC_MESSAGES/tryton.mo and b/share/locale/nl_NL/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/ru_RU/LC_MESSAGES/tryton.mo b/share/locale/ru_RU/LC_MESSAGES/tryton.mo
index 17cc6aa..0618f20 100644
Binary files a/share/locale/ru_RU/LC_MESSAGES/tryton.mo and b/share/locale/ru_RU/LC_MESSAGES/tryton.mo differ
diff --git a/share/locale/sl_SI/LC_MESSAGES/tryton.mo b/share/locale/sl_SI/LC_MESSAGES/tryton.mo
index fd54dd0..fc28b75 100644
Binary files a/share/locale/sl_SI/LC_MESSAGES/tryton.mo and b/share/locale/sl_SI/LC_MESSAGES/tryton.mo differ
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 100c909..ec89304 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.18
+Version: 3.6.19
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index b93370f..d90e8b4 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.18"
+__version__ = "3.6.19"
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 6671506..526393b 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -12,6 +12,7 @@ import re
import logging
import unicodedata
import colorsys
+from decimal import Decimal
from functools import partial
from tryton.config import CONFIG
from tryton.config import TRYTON_ICON, PIXMAPS_DIR
@@ -178,6 +179,14 @@ MODELHISTORY = ModelHistory()
class ViewSearch(object):
searches = {}
+ def __init__(self):
+ class Encoder(PYSONEncoder):
+ def default(self, obj):
+ if isinstance(obj, Decimal):
+ return float(obj)
+ return super(Encoder, self).default(obj)
+ self.encoder = Encoder()
+
def load_searches(self):
try:
self.searches = rpc.execute('model', 'ir.ui.view_search',
@@ -194,7 +203,7 @@ class ViewSearch(object):
'create', [{
'model': model,
'name': name,
- 'domain': PYSONEncoder().encode(domain),
+ 'domain': self.encoder.encode(domain),
}])
except RPCException:
return
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 5e38a0d..e9c9ddc 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -901,7 +901,7 @@ class BinaryField(Field):
def get_data(self, record):
if not isinstance(record.value.get(self.name),
- (basestring, bytes, bytearray)):
+ (basestring, bytes, bytearray, _FileCache)):
if record.id < 0:
return ''
context = record.context_get()
diff --git a/tryton/gui/window/view_form/view/form_gtk/dictionary.py b/tryton/gui/window/view_form/view/form_gtk/dictionary.py
index d6ded4d..f2d9e7d 100644
--- a/tryton/gui/window/view_form/view/form_gtk/dictionary.py
+++ b/tryton/gui/window/view_form/view/form_gtk/dictionary.py
@@ -495,14 +495,17 @@ class DictWidget(Widget):
key_ids = RPCExecute('model', self.schema_model, 'search',
[('name', 'in', sub_keys), domain], 0,
CONFIG['client.limit'], None, context=context)
- if not key_ids:
- continue
+ except RPCException:
+ key_ids = []
+ if not key_ids:
+ continue
+ try:
values = RPCExecute('model', self.schema_model,
'get_keys', key_ids, context=context)
- if not values:
- continue
except RPCException:
- pass
+ values = []
+ if not values:
+ continue
self.keys.update({k['name']: k for k in values})
def display(self, record, field):
--
tryton-client
More information about the tryton-debian-vcs
mailing list