[tryton-debian-vcs] tryton-client branch debian-stretch-3.6 updated. debian/3.6.12-1-2-ge7e38f5

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Nov 8 09:25:18 UTC 2016


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.12-1-2-ge7e38f5

commit e7e38f5c226b3016b2e34dc14cba4d366797fe14
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Nov 8 09:35:18 2016 +0100

    Releasing debian version 3.6.13-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 1802e91..7a94ff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.6.13-1) unstable; urgency=medium
+
+  * Merging upstream version 3.6.13.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 08 Nov 2016 09:35:18 +0100
+
 tryton-client (3.6.12-1) unstable; urgency=medium
 
   * Merging upstream version 3.6.12.
commit a3ea7b06c6d141f59a08a88511956e0406165a81
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Nov 8 09:35:17 2016 +0100

    Merging upstream version 3.6.13.

diff --git a/CHANGELOG b/CHANGELOG
index 87ba2ed..6b6c247 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.13 - 2016-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.12 - 2016-10-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 27c074b..6d0dac9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.12
+Version: 3.6.13
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 27c074b..6d0dac9 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.12
+Version: 3.6.13
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 309e546..07e0435 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.12"
+__version__ = "3.6.13"
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index ad76c7d..0bbc0f8 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -581,9 +581,9 @@ class O2MField(Field):
     def _set_value(self, record, value, default=False):
         self._set_default_value(record)
         group = record.value[self.name]
-        if not value:
-            return
-        if isinstance(value[0], (int, long)):
+        if value is None:
+            value = []
+        if not value or isinstance(value[0], (int, long)):
             mode = 'list ids'
         else:
             mode = 'list values'
diff --git a/tryton/gui/window/view_form/view/list_gtk/widget.py b/tryton/gui/window/view_form/view/list_gtk/widget.py
index 859c4b4..15eefb7 100644
--- a/tryton/gui/window/view_form/view/list_gtk/widget.py
+++ b/tryton/gui/window/view_form/view/list_gtk/widget.py
@@ -416,7 +416,7 @@ class Time(Date):
             return ''
         value = record[self.attrs['name']].get_client(record)
         if value is not None:
-            return value.strftime(self.renderer.props.format)
+            return datetime_strftime(value, self.renderer.props.format)
         else:
             return ''
 
-- 
tryton-client



More information about the tryton-debian-vcs mailing list