[tryton-debian-vcs] tryton-client branch debian updated. debian/4.4.1-2-3-g3715946
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 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/4.4.1-2-3-g3715946
commit 37159463a4b56285b1e195a940e686905e5145f8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 5 11:50:41 2017 +0200
Releasing debian version 4.4.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 77416b8..e8c6dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-client (4.4.2-1) unstable; urgency=medium
+
+ * Bump the Standards-Version to 4.1.0, no changes needed.
+ * Merging upstream version 4.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 05 Oct 2017 11:50:41 +0200
+
tryton-client (4.4.1-2) unstable; urgency=medium
* Use the preferred https URL format in the copyright file.
commit 74c51a7a324b869ce6e8c669e505aa807dfa481e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 5 11:50:41 2017 +0200
Merging upstream version 4.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index c171333..f8582e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.2 - 2017-10-03
+* Bug fixes (see mercurial logs for details)
+
Version 4.4.1 - 2017-08-08
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 95bccd1..f7f5e55 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.4.1
+Version: 4.4.2
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/bin/tryton b/bin/tryton
index 576f8d7..02f319d 100755
--- a/bin/tryton
+++ b/bin/tryton
@@ -23,6 +23,10 @@ if hasattr(sys, 'frozen'):
etc, 'gtk-2.0', 'gdk-pixbuf.loaders')
os.environ['GTK_IM_MODULE_FILE'] = os.path.join(
etc, 'gtk-2.0', 'gtk.immodules')
+ os.environ.setdefault('SSL_CERT_FILE',
+ os.path.join(etc, 'ssl', 'cert.pem'))
+ os.environ.setdefault('SSL_CERT_DIR',
+ os.path.join(etc, 'ssl', 'certs'))
# Disable dbusmenu to show second menu in tabs
diff --git a/setup-freeze.py b/setup-freeze.py
index 0ef6f3a..efcbc73 100644
--- a/setup-freeze.py
+++ b/setup-freeze.py
@@ -20,6 +20,7 @@ if sys.platform == 'win32':
include_files.extend([
(os.path.join(sys.prefix, 'share/themes/MS-Windows'),
'share/themes/MS-Windows'),
+ (os.path.join(sys.prefix, 'ssl'), 'etc/ssl'),
])
dll_paths = os.getenv('PATH', os.defpath).split(os.pathsep)
required_dlls = [
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 95bccd1..f7f5e55 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.4.1
+Version: 4.4.2
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index f9672dc..10d586c 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.4.1"
+__version__ = "4.4.2"
diff --git a/tryton/action/main.py b/tryton/action/main.py
index 4d6c5a1..ed85b20 100644
--- a/tryton/action/main.py
+++ b/tryton/action/main.py
@@ -9,6 +9,7 @@ import tempfile
import os
import webbrowser
from tryton.common import RPCProgress, RPCExecute, RPCException, slugify
+from tryton.config import CONFIG
_ = gettext.gettext
@@ -133,6 +134,9 @@ class Action(object):
res_model = action.get('res_model', data.get('res_model'))
res_id = action.get('res_id', data.get('res_id'))
+ limit = action.get('limit')
+ if limit is None:
+ limit = CONFIG['client.limit']
Window.create(res_model,
view_ids=view_ids,
@@ -142,7 +146,7 @@ class Action(object):
order=order,
mode=view_mode,
name=name,
- limit=action.get('limit'),
+ limit=limit,
search_value=search_value,
icon=(action.get('icon.rec_name') or ''),
tab_domain=tab_domain,
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 1438014..f9af076 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
@@ -175,6 +176,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',
@@ -191,7 +200,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/common/htmltextbuffer.py b/tryton/common/htmltextbuffer.py
index 3b49593..cb7f5b7 100644
--- a/tryton/common/htmltextbuffer.py
+++ b/tryton/common/htmltextbuffer.py
@@ -416,7 +416,8 @@ if __name__ == '__main__':
win.add(vbox)
text_buffer = gtk.TextBuffer()
- text_view = gtk.TextView(text_buffer)
+ text_view = gtk.TextView()
+ text_view.set_buffer(text_buffer)
vbox.pack_start(text_view)
setup_tags(text_buffer)
diff --git a/tryton/data/locale/bg/LC_MESSAGES/tryton.mo b/tryton/data/locale/bg/LC_MESSAGES/tryton.mo
index 1d8f778..f2fe619 100644
Binary files a/tryton/data/locale/bg/LC_MESSAGES/tryton.mo and b/tryton/data/locale/bg/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/ca/LC_MESSAGES/tryton.mo b/tryton/data/locale/ca/LC_MESSAGES/tryton.mo
index 1f97260..e26c8bf 100644
Binary files a/tryton/data/locale/ca/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ca/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/cs/LC_MESSAGES/tryton.mo b/tryton/data/locale/cs/LC_MESSAGES/tryton.mo
index 889ae9a..58289a6 100644
Binary files a/tryton/data/locale/cs/LC_MESSAGES/tryton.mo and b/tryton/data/locale/cs/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/de/LC_MESSAGES/tryton.mo b/tryton/data/locale/de/LC_MESSAGES/tryton.mo
index 6e1b35d..7ef0c91 100644
Binary files a/tryton/data/locale/de/LC_MESSAGES/tryton.mo and b/tryton/data/locale/de/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es/LC_MESSAGES/tryton.mo b/tryton/data/locale/es/LC_MESSAGES/tryton.mo
index 658ff9b..3797da9 100644
Binary files a/tryton/data/locale/es/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo b/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo
index 175029c..234f20f 100644
Binary files a/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo and b/tryton/data/locale/es_419/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/fr/LC_MESSAGES/tryton.mo b/tryton/data/locale/fr/LC_MESSAGES/tryton.mo
index 1acfcbd..324e09b 100644
Binary files a/tryton/data/locale/fr/LC_MESSAGES/tryton.mo and b/tryton/data/locale/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 d580da4..05314b0 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 68b251b..5db1a7d 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 220ab3b..c923938 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/LC_MESSAGES/tryton.mo b/tryton/data/locale/lo/LC_MESSAGES/tryton.mo
index ac8fc14..89aaf78 100644
Binary files a/tryton/data/locale/lo/LC_MESSAGES/tryton.mo and b/tryton/data/locale/lo/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/lt/LC_MESSAGES/tryton.mo b/tryton/data/locale/lt/LC_MESSAGES/tryton.mo
index 706681d..22905b8 100644
Binary files a/tryton/data/locale/lt/LC_MESSAGES/tryton.mo and b/tryton/data/locale/lt/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/nl/LC_MESSAGES/tryton.mo b/tryton/data/locale/nl/LC_MESSAGES/tryton.mo
index d8786a9..b5fffd6 100644
Binary files a/tryton/data/locale/nl/LC_MESSAGES/tryton.mo and b/tryton/data/locale/nl/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/pl/LC_MESSAGES/tryton.mo b/tryton/data/locale/pl/LC_MESSAGES/tryton.mo
index d5c8f69..16ae3e9 100644
Binary files a/tryton/data/locale/pl/LC_MESSAGES/tryton.mo and b/tryton/data/locale/pl/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 f642c21..36c9f9a 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/LC_MESSAGES/tryton.mo b/tryton/data/locale/ru/LC_MESSAGES/tryton.mo
index a72fb11..7c4fb67 100644
Binary files a/tryton/data/locale/ru/LC_MESSAGES/tryton.mo and b/tryton/data/locale/ru/LC_MESSAGES/tryton.mo differ
diff --git a/tryton/data/locale/sl/LC_MESSAGES/tryton.mo b/tryton/data/locale/sl/LC_MESSAGES/tryton.mo
index d0f3872..8b036b8 100644
Binary files a/tryton/data/locale/sl/LC_MESSAGES/tryton.mo and b/tryton/data/locale/sl/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 60fb0db..7fcf130 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 47f02f7..4a398fa 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -909,7 +909,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.get_context()
diff --git a/tryton/gui/window/view_form/screen/screen.py b/tryton/gui/window/view_form/screen/screen.py
index bc633ce..16a3f1e 100644
--- a/tryton/gui/window/view_form/screen/screen.py
+++ b/tryton/gui/window/view_form/screen/screen.py
@@ -737,6 +737,8 @@ class Screen(SignalEvent):
return
if (view.view_type == 'tree'
and not view.attributes.get('tree_state', False)):
+ # Mark as done to not set later when the view_type change
+ self.tree_states_done.add(id(view))
return
parent = self.parent.id if self.parent else None
if parent is not None and parent < 0:
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 0eb3110..ee5c804 100644
--- a/tryton/gui/window/view_form/view/form_gtk/dictionary.py
+++ b/tryton/gui/window/view_form/view/form_gtk/dictionary.py
@@ -507,14 +507,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):
diff --git a/tryton/gui/window/view_form/view/form_gtk/textbox.py b/tryton/gui/window/view_form/view/form_gtk/textbox.py
index b0fe0fa..1572956 100644
--- a/tryton/gui/window/view_form/view/form_gtk/textbox.py
+++ b/tryton/gui/window/view_form/view/form_gtk/textbox.py
@@ -44,7 +44,8 @@ class TextBox(Widget, TranslateMixin):
def _get_textview(self):
if self.attrs.get('size'):
textbuffer = TextBufferLimitSize(int(self.attrs['size']))
- textview = gtk.TextView(textbuffer)
+ textview = gtk.TextView()
+ textview.set_buffer(textbuffer)
else:
textview = gtk.TextView()
textview.set_wrap_mode(gtk.WRAP_WORD)
--
tryton-client
More information about the tryton-debian-vcs
mailing list