[tryton-debian-vcs] tryton-client branch upstream-4.0 updated. upstream/4.0.9-1-gdb27e3f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jun 11 22:34:14 UTC 2017
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.9-1-gdb27e3f
commit db27e3f4b2025acb50e6e2a71b8b04f22ec70dc3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:53:08 2017 +0200
Adding upstream version 4.0.10.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 63e25df..31b8bb3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.10 - 2017-06-05
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.9 - 2017-03-10
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 2ec9ef3..bee605b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.0.9
+Version: 4.0.10
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/setup.cfg b/setup.cfg
index 562c93e..9f35e84 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,5 +21,4 @@ output_dir = tryton/data/locale
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 2ec9ef3..bee605b 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.9
+Version: 4.0.10
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 6e0c88a..4c0f151 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.9"
+__version__ = "4.0.10"
diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py
index 2e2208e..d8dbe2b 100644
--- a/tryton/common/domain_parser.py
+++ b/tryton/common/domain_parser.py
@@ -264,7 +264,7 @@ def convert_value(field, value, context=None):
def convert_datetime():
if not value:
return
- format_ = context.get('date_format', '%X') + ' %x'
+ format_ = context.get('date_format', '%x') + ' %X'
try:
dt = date_parse(value, format_)
if dt.time() == datetime.time.min:
@@ -405,6 +405,9 @@ def test_convert_datetime():
('12/04/2002', datetime.datetime(2002, 12, 4)),
('12/04/2002 12:30:00', untimezoned_date(
datetime.datetime(2002, 12, 4, 12, 30))),
+ ('02/03/04', datetime.datetime(2004, 2, 3)),
+ ('02/03/04 05:06:07', untimezoned_date(
+ datetime.datetime(2004, 2, 3, 5, 6, 7))),
('test', None),
(None, None),
):
diff --git a/tryton/common/popup_menu.py b/tryton/common/popup_menu.py
index 9cf201e..d07f7bf 100644
--- a/tryton/common/popup_menu.py
+++ b/tryton/common/popup_menu.py
@@ -61,7 +61,8 @@ def populate(menu, model, record, title='', field=None):
def edit(menuitem):
with Window(hide_current=True, allow_similar=True):
- Window.create(field.attrs.get('view_ids'), model, id_(record),
+ Window.create(
+ field.attrs.get('view_ids', '').split(','), model, id_(record),
mode=['form'])
if title:
diff --git a/tryton/data/locale/bg_BG/LC_MESSAGES/tryton.mo b/tryton/data/locale/bg_BG/LC_MESSAGES/tryton.mo
index 7478145..db7cbe4 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 c9cc5b6..92b0745 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 297db93..8383663 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 76c2e3b..bd39d95 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 98256d8..a8e46f5 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 26b759f..6884682 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 fc07c87..cbcce8d 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 8b37083..02a0450 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 c8baab6..6d0841b 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 c48c797..d271335 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 e232d83..04d2bba 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 b8e1f55..10fc04f 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 f3ea048..e0e7201 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 8541e9f..1f72794 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 340ba65..923f91f 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 ed6158d..e27c8dc 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 e5d89c9..7df1341 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 5b28f0b..0b2e38d 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 0ab8fe1..65e3f42 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 2733105..e24e08f 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/form.py b/tryton/gui/window/form.py
index 5bceecb..ac479f4 100644
--- a/tryton/gui/window/form.py
+++ b/tryton/gui/window/form.py
@@ -272,7 +272,7 @@ class Form(SignalEvent, TabContent):
except RPCException:
return
date_format = self.screen.context.get('date_format', '%x')
- datetime_format = date_format + ' %X.%f'
+ datetime_format = date_format + ' %H:%M:%S.%f'
message_str = ''
for line in res:
for (key, val) in fields:
@@ -298,7 +298,7 @@ class Form(SignalEvent, TabContent):
return
revision = self.screen.context.get('_datetime')
format_ = self.screen.context.get('date_format', '%x')
- format_ += ' %X.%f'
+ format_ += ' %H:%M:%S.%f'
revision = Revision(revisions, revision, format_).run()
# Prevent too old revision in form view
if (self.screen.current_view.view_type == 'form'
@@ -322,7 +322,7 @@ class Form(SignalEvent, TabContent):
revision = self.screen.context.get('_datetime')
if revision:
format_ = self.screen.context.get('date_format', '%x')
- format_ += ' %X.%f'
+ format_ += ' %H:%M:%S.%f'
revision = datetime_strftime(revision, format_)
self.title.set_label('%s @ %s' % (self.name, revision))
else:
diff --git a/tryton/gui/window/revision.py b/tryton/gui/window/revision.py
index 3b8af89..431ca45 100644
--- a/tryton/gui/window/revision.py
+++ b/tryton/gui/window/revision.py
@@ -14,7 +14,7 @@ _ = gettext.gettext
class Revision(object):
'Ask revision'
- def __init__(self, revisions, revision=None, format_='%x %X.%f'):
+ def __init__(self, revisions, revision=None, format_='%x %H:%M:%S.%f'):
self.parent = get_toplevel_window()
self.win = gtk.Dialog(_('Revision'), self.parent,
gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
diff --git a/tryton/gui/window/view_board/action.py b/tryton/gui/window/view_board/action.py
index ddd801c..83ee568 100644
--- a/tryton/gui/window/view_board/action.py
+++ b/tryton/gui/window/view_board/action.py
@@ -17,9 +17,11 @@ _ = gettext.gettext
class Action(SignalEvent):
def __init__(self, attrs=None, context=None):
+ if context is None:
+ context = {}
super(Action, self).__init__()
self.name = attrs['name']
- self.context = context or {}
+ self.context = context.copy()
try:
self.action = RPCExecute('model', 'ir.action.act_window', 'get',
diff --git a/tryton/gui/window/view_form/model/record.py b/tryton/gui/window/view_form/model/record.py
index 18fb6a2..f0aad18 100644
--- a/tryton/gui/window/view_form/model/record.py
+++ b/tryton/gui/window/view_form/model/record.py
@@ -389,7 +389,7 @@ class Record(SignalEvent):
for field_name, field in self.group.fields.iteritems():
if fields is not None and field_name not in fields:
continue
- if field.get_state_attrs(self).get('readonly', False):
+ if field.attrs.get('readonly'):
continue
if field_name == self.group.exclude_field:
continue
--
tryton-client
More information about the tryton-debian-vcs
mailing list