[tryton-debian-vcs] tryton-client branch upstream-3.2 updated. upstream/3.2.11-1-g97fb0fc
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jan 17 20:26:17 UTC 2016
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.11-1-g97fb0fc
commit 97fb0fc6858a5216864f30b8773fae5266c06478
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jan 17 19:44:26 2016 +0100
Adding upstream version 3.2.12.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 19d054f..d04ff7d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.12 - 2016-01-11
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.11 - 2015-11-09
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index ee03e0f..43d70ed 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,8 +1,8 @@
Copyright (C) 2012-2013 Antoine Smolders.
Copyright (C) 2010-2015 Nicolas Évrard.
-Copyright (C) 2007-2015 Cédric Krier.
+Copyright (C) 2007-2016 Cédric Krier.
Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 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 95c145b..346cc45 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.2.11
+Version: 3.2.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 95c145b..346cc45 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.11
+Version: 3.2.12
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/common/domain_inversion.py b/tryton/common/domain_inversion.py
index 892c01a..ca3ae50 100644
--- a/tryton/common/domain_inversion.py
+++ b/tryton/common/domain_inversion.py
@@ -95,7 +95,10 @@ def eval_leaf(part, context, boolop=operator.and_):
'=': 'in',
'!=': 'not in',
}[operand]
- return OPERATORS[operand](context_field, value)
+ try:
+ return OPERATORS[operand](context_field, value)
+ except TypeError:
+ return False
def inverse_leaf(domain):
diff --git a/tryton/gui/window/view_form/view/form_gtk/many2one.py b/tryton/gui/window/view_form/view/form_gtk/many2one.py
index cc199bc..844a28f 100644
--- a/tryton/gui/window/view_form/view/form_gtk/many2one.py
+++ b/tryton/gui/window/view_form/view/form_gtk/many2one.py
@@ -372,12 +372,14 @@ class Many2One(WidgetInterface):
def _completion_match_selected(self, completion, model, iter_):
rec_name, record_id = model.get(iter_, 0, 1)
- self.field.set_client(self.record,
- self.value_from_id(record_id, rec_name), force_change=True)
+ # GTK on win32 doesn't like synchronous call to set_client
+ # because it triggers a display which reset the completion
+ gobject.idle_add(self.field.set_client, self.record,
+ self.value_from_id(record_id, rec_name), True)
completion_model = self.wid_completion.get_model()
completion_model.clear()
- completion_model.search_text = self.wid_text.get_text()
+ completion_model.search_text = rec_name
return True
def _update_completion(self, widget):
diff --git a/tryton/gui/window/win_export.py b/tryton/gui/window/win_export.py
index 903b687..0573458 100644
--- a/tryton/gui/window/win_export.py
+++ b/tryton/gui/window/win_export.py
@@ -439,5 +439,5 @@ class WinExport(NoModal):
return True
except IOError, exception:
common.warning(_("Operation failed!\nError message:\n%s")
- % (exception.faultCode,), _('Error'))
+ % exception, _('Error'))
return False
diff --git a/tryton/version.py b/tryton/version.py
index 64e126c..810c280 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.11"
+VERSION = "3.2.12"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list