[tryton-debian-vcs] tryton-client branch debian-stretch-4.2 updated. debian/4.2.4-1-3-geb6375a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jun 11 22:34:13 UTC 2017
The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/4.2.4-1-3-geb6375a
commit eb6375a57057704f1b25fd2825ce472290b297b5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:54:39 2017 +0200
Releasing debian version 4.2.5-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 72466a6..db0d6cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-client (4.2.5-1) unstable; urgency=medium
+
+ * Setting the branch in the watch file to the fixed version 4.2.
+ * Merging upstream version 4.2.5.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 11 Jun 2017 22:54:39 +0200
+
tryton-client (4.2.4-1) unstable; urgency=medium
* Add the actual upstream maintainer key to signing-key.asc.
commit 5f9b58720d7f7f585e3fc249f415bc9203b8f967
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:54:38 2017 +0200
Merging upstream version 4.2.5.
diff --git a/CHANGELOG b/CHANGELOG
index dbb37d1..a07020b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.5 - 2017-06-05
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.4 - 2017-03-10
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 122201a..9bc66c6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 4.2.4
+Version: 4.2.5
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 122201a..9bc66c6 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.2.4
+Version: 4.2.5
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index baba577..7899013 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.2.4"
+__version__ = "4.2.5"
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 1d34fc6..78256eb 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -347,7 +347,7 @@ def selection(title, values, alwaysask=False):
scrolledwindow.add(treeview)
dialog.vbox.pack_start(scrolledwindow, True, True)
- treeview.get_selection().set_mode('single')
+ treeview.get_selection().set_mode(gtk.SELECTION_SINGLE)
cell = gtk.CellRendererText()
column = gtk.TreeViewColumn("Widget", cell, text=0)
treeview.append_column(column)
diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py
index eb07110..9718f31 100644
--- a/tryton/common/domain_parser.py
+++ b/tryton/common/domain_parser.py
@@ -265,7 +265,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:
@@ -406,6 +406,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 20289e2..3b5becd 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'], name=field.attrs.get('string'))
if title:
diff --git a/tryton/data/locale/bg/LC_MESSAGES/tryton.mo b/tryton/data/locale/bg/LC_MESSAGES/tryton.mo
index c788fa9..1718f8e 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 90e2e90..de3a17d 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 efd5d8d..f5c66d9 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 5080736..8820877 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 2df14eb..d2444cc 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 2bb88bf..c16d91e 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 79692cf..ca7f0e7 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 9249bda..2151a7f 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 a8cdf6c..e0ff515 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 fc17fbb..fe8810a 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 1c796c4..0737e05 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 628d572..82423db 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 7779d15..6532b2c 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 197cb5a..edc7344 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 11a9246..4342fc3 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 26aafa2..f7df1b1 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 0b83b03..96e2bed 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 0680a6f..ad3ddc8 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 93d2914..c4b9d37 100644
--- a/tryton/gui/window/form.py
+++ b/tryton/gui/window/form.py
@@ -268,7 +268,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:
@@ -294,7 +294,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'
@@ -318,7 +318,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 1c37d08..3a4d8a1 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 d34a608..fdc0b2b 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 de92742..ad4ce61 100644
--- a/tryton/gui/window/view_form/model/record.py
+++ b/tryton/gui/window/view_form/model/record.py
@@ -404,7 +404,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
diff --git a/tryton/gui/window/view_form/screen/screen.py b/tryton/gui/window/view_form/screen/screen.py
index 5b11dc1..3450638 100644
--- a/tryton/gui/window/view_form/screen/screen.py
+++ b/tryton/gui/window/view_form/screen/screen.py
@@ -861,9 +861,9 @@ class Screen(SignalEvent):
if view.view_type == 'tree' and len(self.group):
start, end = view.treeview.get_visible_range()
vadjustment = view.treeview.get_vadjustment()
- vadjustment.value = min(
- vadjustment.value + vadjustment.page_increment,
- vadjustment.get_upper())
+ vadjustment.props.value = min(
+ vadjustment.props.value + vadjustment.props.page_increment,
+ vadjustment.props.upper)
model = view.treeview.get_model()
iter_ = model.get_iter(end)
self.current_record = model.get_value(iter_, 0)
@@ -928,9 +928,9 @@ class Screen(SignalEvent):
if view.view_type == 'tree' and len(self.group):
start, end = view.treeview.get_visible_range()
vadjustment = view.treeview.get_vadjustment()
- vadjustment.value = min(
- vadjustment.value - vadjustment.page_increment,
- vadjustment.get_lower())
+ vadjustment.props.value = min(
+ vadjustment.props.value - vadjustment.props.page_increment,
+ vadjustment.props.lower)
model = view.treeview.get_model()
iter_ = model.get_iter(start)
self.current_record = model.get_value(iter_, 0)
--
tryton-client
More information about the tryton-debian-vcs
mailing list