[tryton-debian-vcs] tryton-client branch upstream-3.6 updated. upstream/3.6.11-1-g96cd589

[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.11-1-g96cd589

commit 96cd5896f470914563bb04b0146139c9e86de81e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Oct 3 12:50:30 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index e3fe338..87ba2ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.12 - 2016-10-02
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.11 - 2016-09-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 743694d..27c074b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.11
+Version: 3.6.12
 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 743694d..27c074b 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.11
+Version: 3.6.12
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 53d34e3..309e546 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.11"
+__version__ = "3.6.12"
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 26e7b79..ab13300 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -467,6 +467,10 @@ def file_selection(title, filename='',
         win.set_preview_widget(img_preview)
         win.connect('update-preview', update_preview_cb, img_preview)
 
+    if os.name == 'nt':
+        encoding = 'utf-8'
+    else:
+        encoding = sys.getfilesystemencoding()
     button = win.run()
     if button != gtk.RESPONSE_OK:
         parent.present()
@@ -475,7 +479,7 @@ def file_selection(title, filename='',
     if not multi:
         filepath = win.get_filename()
         if filepath:
-            filepath = filepath.decode('utf-8')
+            filepath = unicode(filepath, encoding)
             try:
                 CONFIG['client.default_path'] = \
                     os.path.dirname(filepath)
@@ -488,7 +492,7 @@ def file_selection(title, filename='',
     else:
         filenames = win.get_filenames()
         if filenames:
-            filenames = [x.decode('utf-8') for x in filenames]
+            filenames = [unicode(x, encoding) for x in filenames]
             try:
                 CONFIG['client.default_path'] = \
                     os.path.dirname(filenames[0])
diff --git a/tryton/gui/main.py b/tryton/gui/main.py
index 4dbb7ff..e731944 100644
--- a/tryton/gui/main.py
+++ b/tryton/gui/main.py
@@ -731,9 +731,10 @@ class Main(object):
                 False, mode=['tree', 'form'])
         try:
             favorites = RPCExecute('model',
-                self.menu_screen.model_name + '.favorite', 'get')
-        except RPCException:
-            favorites = []
+                self.menu_screen.model_name + '.favorite', 'get',
+                process_exception=False)
+        except Exception:
+            return False
         menu = self.menuitem_favorite.get_submenu()
         if not menu:
             menu = gtk.Menu()
diff --git a/tryton/gui/window/view_form/view/calendar_gtk/calendar_.py b/tryton/gui/window/view_form/view/calendar_gtk/calendar_.py
index ecb46f9..e2e35cc 100644
--- a/tryton/gui/window/view_form/view/calendar_gtk/calendar_.py
+++ b/tryton/gui/window/view_form/view/calendar_gtk/calendar_.py
@@ -91,6 +91,10 @@ class Calendar_(goocalendar.Calendar):
             elif not end:
                 all_day = True
 
+            # Skip invalid event
+            if end is not None and start > end:
+                continue
+
             # TODO define color code
             label = '\n'.join(record[attrs['name']].get_client(record)
                 for attrs in self.fields).rstrip()
-- 
tryton-client