From cddfaed55f892c7df7deb2f3b4646ce14a9b41d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 24 Oct 2011 20:11:25 +0200 Subject: [PATCH 1/4] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 0d4904f920..91a9ebaef0 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_ES': 'País', 'name_fr_FR': 'Pays', 'name_ru_RU': 'Страны', - 'version' : '2.2.0', + 'version' : '2.2.1', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From c910df1cee374c2bf4d219d4a49e5eeb611ec9c9 Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:42:53 +0200 Subject: [PATCH 2/4] Fix domain concatenation between list and tuple issue3386 review1099002 (transplanted from c645efcacf9f010629427d69d05a6cb7879e2af3) --- country.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/country.py b/country.py index 402b458d25..2e6f04a622 100644 --- a/country.py +++ b/country.py @@ -27,10 +27,10 @@ class Country(ModelSQL, ModelView): self._order.insert(0, ('name', 'ASC')) def search_rec_name(self, name, clause): - ids = self.search([('code',) + clause[1:]], limit=1) + ids = self.search([('code',) + tuple(clause[1:])], limit=1) if ids: - return [('code',) + clause[1:]] - return [(self._rec_name,) + clause[1:]] + return [('code',) + tuple(clause[1:])] + return [(self._rec_name,) + tuple(clause[1:])] def create(self, vals): if 'code' in vals and vals['code']: @@ -144,10 +144,10 @@ class Subdivision(ModelSQL, ModelView): self._order.insert(0, ('code', 'ASC')) def search_rec_name(self, name, clause): - ids = self.search([('code',) + clause[1:]], limit=1) + ids = self.search([('code',) + tuple(clause[1:])], limit=1) if ids: - return [('code',) + clause[1:]] - return [(self._rec_name,) + clause[1:]] + return [('code',) + tuple(clause[1:])] + return [(self._rec_name,) + tuple(clause[1:])] def create(self, vals): if 'code' in vals and vals['code']: From 5f85f699a12689f7a252df855b5e4fe8fa21dd30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:36:33 +0100 Subject: [PATCH 3/4] Prepare release 2.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b0908d0ed8..5b285c58ae 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-24 * Bug fixes (see mercurial logs for details) From 9288ba0f0998cd0245a26b07466216b982faa946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:36:34 +0100 Subject: [PATCH 4/4] Added tag 2.2.1 for changeset 2fb38a434f88 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 21ed8e860f..85da456f36 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ fadc4c9bfd476e840992273ea1d7c33f2a5eb656 1.4.0 57ecfe6831e082b4eca380e4fb421825e1092f49 1.8.0 448121ae58527d666e5e5041ef283052a2d2ab78 2.0.0 4e14138f332644ff40cb46a395696f059758cce7 2.2.0 +2fb38a434f8820fa8e865c0b5d5cbce8dd48ad67 2.2.1