[tryton-debian-vcs] tryton-client branch upstream-3.2 updated. upstream/3.2.6-1-g07e22f9
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 18 10:02:07 UTC 2015
The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=upstream/3.2.6-1-g07e22f9
commit 07e22f9a884f313ba1ca40cb7886dba5ea4947b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 17 21:20:57 2015 +0100
Adding upstream version 3.2.7.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index d696be2..2b4c0f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.7 - 2015-02-16
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.6 - 2014-12-03
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index c952d2e..ee03e0f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,8 +1,8 @@
Copyright (C) 2012-2013 Antoine Smolders.
-Copyright (C) 2010-2014 Nicolas Évrard.
-Copyright (C) 2007-2014 Cédric Krier.
+Copyright (C) 2010-2015 Nicolas Évrard.
+Copyright (C) 2007-2015 Cédric Krier.
Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2014 B2CK SPRL.
+Copyright (C) 2008-2015 B2CK SPRL.
Copyright (C) 2008-2011 Udo Spallek.
Copyright (C) 2008-2011 virtual things - Preisler & Spallek GbR.
Copyright (C) 2011-2012 Rodrigo Hübner.
diff --git a/PKG-INFO b/PKG-INFO
index bf2cd95..e9489ce 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.2.6
+Version: 3.2.7
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/setup.py b/setup.py
index de7b229..224a153 100644
--- a/setup.py
+++ b/setup.py
@@ -108,7 +108,8 @@ elif sys.platform == 'darwin':
'includes': ('pygtk, gtk, glib, cairo, pango, pangocairo, atk, '
'gobject, gio, gtk.keysyms'),
'resources': 'tryton/plugins',
- 'frameworks': 'librsvg-2.2.dylib',
+ 'frameworks':
+ 'librsvg-2.2.dylib, libjpeg.8.dylib, libtiff.3.dylib',
'plist': {
'CFBundleIdentifier': 'org.tryton',
'CFBundleName': 'Tryton',
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index bf2cd95..e9489ce 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.2.6
+Version: 3.2.7
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py
index 43ef444..76188ce 100644
--- a/tryton/common/domain_parser.py
+++ b/tryton/common/domain_parser.py
@@ -12,7 +12,7 @@ import io
from collections import OrderedDict
from tryton.translate import date_format
-from tryton.common import untimezoned_date, datetime_strftime
+from tryton.common import untimezoned_date, timezoned_date, datetime_strftime
from tryton.pyson import PYSONDecoder
__all__ = ['DomainParser']
@@ -462,7 +462,10 @@ def format_value(field, value, target=None):
if (not isinstance(value, datetime.datetime)
or value.time() == datetime.time.min):
format_ = date_format()
- return datetime_strftime(value, format_)
+ time = value
+ else:
+ time = timezoned_date(value)
+ return datetime_strftime(time, format_)
def format_date():
if not value:
@@ -588,7 +591,8 @@ def test_format_datetime():
for value, result in (
(datetime.date(2002, 12, 4), '12/04/2002'),
(datetime.datetime(2002, 12, 4), '12/04/2002'),
- (datetime.datetime(2002, 12, 4, 12, 30), '"12/04/2002 12:30:00"'),
+ (untimezoned_date(datetime.datetime(2002, 12, 4, 12, 30)),
+ '"12/04/2002 12:30:00"'),
(False, ''),
(None, ''),
):
@@ -655,7 +659,7 @@ def complete_value(field, value):
def complete_datetime():
yield datetime.date.today()
- yield datetime.datetime.now()
+ yield datetime.datetime.utcnow()
def complete_date():
yield datetime.date.today()
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 5326645..5dd3cbc 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -648,6 +648,9 @@ class O2MField(Field):
self._connect_value(group)
def set_client(self, record, value, force_change=False):
+ # domain inversion could try to set None as value
+ if value is None:
+ value = []
# domain inversion could try to set id as value
if isinstance(value, (int, long)):
value = [value]
diff --git a/tryton/gui/window/view_form/view/list_gtk/parser.py b/tryton/gui/window/view_form/view/list_gtk/parser.py
index 478cd62..8bbf7a9 100644
--- a/tryton/gui/window/view_form/view/list_gtk/parser.py
+++ b/tryton/gui/window/view_form/view/list_gtk/parser.py
@@ -66,7 +66,7 @@ def sort_model(column, treeview, screen):
column.arrow.hide()
store = treeview.get_model()
unsaved_records = [x for x in store.group if x.id < 0]
- search_string = screen.screen_container.get_text() or None
+ search_string = screen.screen_container.get_text() or u''
if screen.search_count == len(store) or unsaved_records or screen.parent:
ids = screen.search_filter(search_string=search_string, only_ids=True)
store.sort(ids)
diff --git a/tryton/gui/window/win_import.py b/tryton/gui/window/win_import.py
index ede68c7..7f8284b 100644
--- a/tryton/gui/window/win_import.py
+++ b/tryton/gui/window/win_import.py
@@ -238,6 +238,9 @@ class WinImport(NoModal):
def on_row_expanded(self, treeview, iter, path):
child = self.model1.iter_children(iter)
+ # autodetect could call for node without children
+ if child is None:
+ return
if self.model1.get_value(child, 0) is None:
prefix_field = self.model1.get_value(iter, 1)
name, model = self.fields[prefix_field]
diff --git a/tryton/version.py b/tryton/version.py
index 64fa695..9960e63 100644
--- a/tryton/version.py
+++ b/tryton/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "tryton"
-VERSION = "3.2.6"
+VERSION = "3.2.7"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list