[tryton-debian-vcs] tryton-client branch upstream-2.6 updated. upstream/2.6.14-1-g864fafa

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=upstream/2.6.14-1-g864fafa

commit 864fafa5bc3ab1fad3f2f1dd5f4ebb1bbde8ce9d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 17 21:17:42 2015 +0100

    Adding upstream version 2.6.15.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 64e31fc..d850c4b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.15 - 2015-02-16
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.14 - 2014-11-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index e039041..b7bfaa2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-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-2012 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 0c4c937..a337038 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 2.6.14
+Version: 2.6.15
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/setup.py b/setup.py
index d631245..e25c95e 100644
--- a/setup.py
+++ b/setup.py
@@ -106,7 +106,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 0c4c937..a337038 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 2.6.14
+Version: 2.6.15
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/tryton/common/domain_parser.py b/tryton/common/domain_parser.py
index 492638f..26e64f7 100644
--- a/tryton/common/domain_parser.py
+++ b/tryton/common/domain_parser.py
@@ -12,7 +12,7 @@ import io
 import collections
 
 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']
@@ -417,7 +417,10 @@ def format_value(field, value):
         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:
@@ -537,7 +540,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, ''),
             ):
@@ -591,7 +595,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/view/list_gtk/parser.py b/tryton/gui/window/view_form/view/list_gtk/parser.py
index 68e731f..40c0f58 100644
--- a/tryton/gui/window/view_form/view/list_gtk/parser.py
+++ b/tryton/gui/window/view_form/view/list_gtk/parser.py
@@ -62,7 +62,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 eee41a5..693d155 100644
--- a/tryton/gui/window/win_import.py
+++ b/tryton/gui/window/win_import.py
@@ -236,6 +236,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 ee65cc8..d9da2a0 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 = "2.6.14"
+VERSION = "2.6.15"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-client