From 5b42e24bd76130d5c20f0f5950ecf9200b6ac304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 24 Oct 2011 17:47:13 +0200 Subject: [PATCH 1/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a325ee9a10..7bfe4c6f1a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Contabilidad Analítica', 'name_es_ES': 'Contabilidad analítica', 'name_fr_FR': 'Comptabilité analytique', - 'version': '2.2.0', + 'version': '2.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From e1166c5fde1f2bcf426da093197b1657192bc9d7 Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:42:26 +0200 Subject: [PATCH 2/5] Fix domain concatenation between list and tuple issue3386 review1099002 (transplanted from 20bb1b1c90b49ad77a699bc0138165e9beb0dc2d) --- account.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/account.py b/account.py index 8bf2deede9..0c9ef19ab5 100644 --- a/account.py +++ b/account.py @@ -243,11 +243,11 @@ class Account(ModelSQL, ModelView): return res 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 [('code',) + tuple(clause[1:])] else: - return [(self._rec_name,) + clause[1:]] + return [(self._rec_name,) + tuple(clause[1:])] def convert_view(self, tree): res = tree.xpath('//field[@name=\'analytic_accounts\']') From 0b0e109b7ba5fd2d4e04a5ac4777d8c6aeedfffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:37:20 +0100 Subject: [PATCH 3/5] Prepare release 2.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d856081690..4e45cd5eea 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 30ad19738fd8c248d4cad1fd118ec5ef04a409b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:37:21 +0100 Subject: [PATCH 4/5] Added tag 2.2.1 for changeset 5c74598f5af8 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 32db669970..c6049fb48a 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ bd0deaee51d39f2ec3db0c089b332ad74b9e7209 1.6.0 21e63a48f4f4941ec2726a585f01edbd1e90f2c2 1.8.0 9f98f48801a86c3076c42977e52214af5f24ff9c 2.0.0 d8590ee13df03c3f5e3677ef2b57765a72c09092 2.2.0 +5c74598f5af891da3ba8498d1542723b39ea86d9 2.2.1 From db2987fd2fa9d8f4864286b2d694aedafd9fd44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:37:49 +0100 Subject: [PATCH 5/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 7bfe4c6f1a..722f432ce3 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Contabilidad Analítica', 'name_es_ES': 'Contabilidad analítica', 'name_fr_FR': 'Comptabilité analytique', - 'version': '2.2.1', + 'version': '2.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',