[tryton-debian-vcs] tryton-server branch upstream-2.2 updated. upstream/2.2.11-1-ge91902c

[Mathias Behrle]

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

commit e91902c4c62caf1181e8623795dc40aaad9770c2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 12 13:35:45 2013 +0100

    Adding upstream version 2.2.12.

diff --git a/CHANGELOG b/CHANGELOG
index db127a8..0fbe7e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.12 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.11 - 2013-10-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 633e89f..6374928 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.2.11
+Version: 2.2.12
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 633e89f..6374928 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.2.11
+Version: 2.2.12
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/trytond/error.py b/trytond/error.py
index 4ad052a..1299fbd 100644
--- a/trytond/error.py
+++ b/trytond/error.py
@@ -40,7 +40,7 @@ class WarningErrorMixin(object):
         if res:
             error = res
 
-        if error_args:
+        if error_args is not None:
             try:
                 error = error % error_args
             except TypeError:
diff --git a/trytond/ir/lang.py b/trytond/ir/lang.py
index 9112f07..fef1a04 100644
--- a/trytond/ir/lang.py
+++ b/trytond/ir/lang.py
@@ -55,9 +55,9 @@ class Lang(ModelSQL, ModelView, Cacheable):
         })
 
     def search_rec_name(self, name, clause):
-        ids = self.search([('code',) + clause[1:]], order=[])
+        ids = self.search([('code',) + tuple(clause[1:])], order=[])
         if ids:
-            ids += self.search([('name',) + clause[1:]], order=[])
+            ids += self.search([('name',) + tuple(clause[1:])], order=[])
             return [('id', 'in', ids)]
         return [('name',) + tuple(clause[1:])]
 
diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py
index 7dfd6e2..278fb03 100644
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -1446,9 +1446,9 @@ class ModelSQL(ModelStorage):
 
                 if isinstance(domain[i][2], basestring):
                     # get the ids of the records of the "distant" resource
-                    ids2 = [x[0] for x in field_obj.search([
-                        ('rec_name', domain[i][1], domain[i][2]),
-                        ], order=[])]
+                    ids2 = field_obj.search([
+                            ('rec_name', domain[i][1], domain[i][2]),
+                            ], order=[])
                 else:
                     ids2 = domain[i][2]
 
@@ -1503,9 +1503,9 @@ class ModelSQL(ModelStorage):
                     target_obj = field.get_target()
                 if domain[i][1] in ('child_of', 'not child_of'):
                     if isinstance(domain[i][2], basestring):
-                        ids2 = [x[0] for x in target_obj.search([
-                            ('rec_name', 'ilike', domain[i][2]),
-                            ], order=[])]
+                        ids2 = target_obj.search([
+                                ('rec_name', 'ilike', domain[i][2]),
+                                ], order=[])
                     elif not isinstance(domain[i][2], list):
                         ids2 = [domain[i][2]]
                     else:
diff --git a/trytond/version.py b/trytond/version.py
index 4a3035b..6059f37 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,7 +1,7 @@
 #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 = "trytond"
-VERSION = "2.2.11"
+VERSION = "2.2.12"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
 
-- 
tryton-server