[tryton-debian-vcs] tryton-client branch upstream-3.6 updated. upstream/3.6.14-1-g8ab2594

[Mathias Behrle]

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

commit 8ab25941a556a03fe6247688e726621f3b29d25b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jan 4 12:49:02 2017 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index b2e68c1..f9180ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.15 - 2017-01-03
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.14 - 2016-12-17
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 825f062..ccd4bce 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,8 +1,8 @@
 Copyright (C) 2012-2013 Antoine Smolders.
 Copyright (C) 2010-2016 Nicolas Évrard.
-Copyright (C) 2007-2016 Cédric Krier.
+Copyright (C) 2007-2017 Cédric Krier.
 Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 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 77c4282..346fda6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.14
+Version: 3.6.15
 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 77c4282..346fda6 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.14
+Version: 3.6.15
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 2767f2e..ee0493d 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.14"
+__version__ = "3.6.15"
diff --git a/tryton/common/placeholder_entry.py b/tryton/common/placeholder_entry.py
index 427fe01..8fec7c4 100644
--- a/tryton/common/placeholder_entry.py
+++ b/tryton/common/placeholder_entry.py
@@ -34,6 +34,8 @@ class PlaceholderEntry(gtk.Entry):
     def set_placeholder_text(self, text):
         self._placeholder = text
         if not self.has_focus():
+            if self._default:
+                super(PlaceholderEntry, self).set_text('')
             self._focus_out()
 
     def get_text(self):
@@ -61,6 +63,8 @@ if __name__ == '__main__':
 
     placeholder_entry = PlaceholderEntry()
     placeholder_entry.set_placeholder_text('Placeholder')
+    # Set twice to check placeholder does not become text
+    placeholder_entry.set_placeholder_text('Placeholder')
     vbox.pack_start(placeholder_entry)
 
     win.show_all()
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 15eefb7..edbd69c 100644
--- a/tryton/gui/window/view_form/view/list_gtk/widget.py
+++ b/tryton/gui/window/view_form/view/list_gtk/widget.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.
-
+import datetime
 import os
 import tempfile
 import gtk
@@ -416,7 +416,9 @@ class Time(Date):
             return ''
         value = record[self.attrs['name']].get_client(record)
         if value is not None:
-            return datetime_strftime(value, self.renderer.props.format)
+            if isinstance(value, datetime.datetime):
+                value = value.time()
+            return value.strftime(self.renderer.props.format)
         else:
             return ''
 
-- 
tryton-client