[tryton-debian-vcs] tryton-client branch debian-jessie-3.2 updated. debian/3.2.17-1-2-g884e027
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon Oct 3 14:10:30 UTC 2016
The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.2.17-1-2-g884e027
commit 884e027838baaa9c52c2c1b227e37d22bf2de17e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 3 12:47:48 2016 +0200
Releasing debian version 3.2.18-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 919c88a..f5b9ea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.2.18-1) unstable; urgency=medium
+
+ * Merging upstream version 3.2.18.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 03 Oct 2016 12:47:48 +0200
+
tryton-client (3.2.17-1) unstable; urgency=medium
* Merging upstream version 3.2.17.
commit e5d442f3d91cf4a7ea9e9414bc1e1173f709744f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 3 12:47:47 2016 +0200
Merging upstream version 3.2.18.
diff --git a/CHANGELOG b/CHANGELOG
index 87814ef..8092227 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.18 - 2016-10-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.17 - 2016-09-03
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index d1a209f..e56c374 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.2.17
+Version: 3.2.18
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 d1a209f..e56c374 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.17
+Version: 3.2.18
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 37b9ac7..4d41695 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -479,6 +479,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()
@@ -487,7 +491,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)
@@ -500,7 +504,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 899bce2..57ce8b9 100644
--- a/tryton/gui/main.py
+++ b/tryton/gui/main.py
@@ -778,9 +778,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 290b0c2..10d934c 100644
--- a/tryton/gui/window/view_form/view/calendar_gtk/calendar_.py
+++ b/tryton/gui/window/view_form/view/calendar_gtk/calendar_.py
@@ -106,6 +106,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[name].get_client(record)
for name in fields).rstrip()
diff --git a/tryton/version.py b/tryton/version.py
index 5be4a01..eb341e5 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.17"
+VERSION = "3.2.18"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list