[tryton-debian-vcs] tryton-client branch debian-stretch-3.6 updated. debian/3.6.16-1-2-gbe56ad1
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-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.6.16-1-2-gbe56ad1
commit be56ad13750d26cfed49ee2f7c8da791cecd5e57
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:51:32 2017 +0200
Releasing debian version 3.6.17-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 5275047..8867835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.6.17-1) unstable; urgency=medium
+
+ * Merging upstream version 3.6.17.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 11 Jun 2017 22:51:32 +0200
+
tryton-client (3.6.16-1) unstable; urgency=medium
* Add the actual upstream maintainer key to signing-key.asc.
commit 9e2d4ea9a155611ea2f0025d3c0a9037768ff569
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:51:32 2017 +0200
Merging upstream version 3.6.17.
diff --git a/CHANGELOG b/CHANGELOG
index 75ad3de..a21ab35 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.17 - 2017-06-05
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.16 - 2017-03-10
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 8ce763e..973fb07 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.6.16
+Version: 3.6.17
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/setup.cfg b/setup.cfg
index 3acc320..2fa1947 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,5 +21,4 @@ output_dir = share/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 8ce763e..973fb07 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.16
+Version: 3.6.17
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index e44697c..db08ff7 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.16"
+__version__ = "3.6.17"
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 d577aea..b344075 100644
--- a/tryton/common/popup_menu.py
+++ b/tryton/common/popup_menu.py
@@ -57,7 +57,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/gui/window/form.py b/tryton/gui/window/form.py
index 0193601..610b404 100644
--- a/tryton/gui/window/form.py
+++ b/tryton/gui/window/form.py
@@ -247,7 +247,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:
@@ -273,7 +273,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'
@@ -297,7 +297,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 483696d..2a4d399 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 a813719..79ecfcb 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 9637f45..c56c4ad 100644
--- a/tryton/gui/window/view_form/model/record.py
+++ b/tryton/gui/window/view_form/model/record.py
@@ -388,7 +388,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