From a471cc7458cf8eec736640250fa0e79d92f13bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 22:59:07 +0200 Subject: [PATCH 1/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 164f1328f0..9d690ee8f2 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.0 +version=2.6.1 depends: ir res From 748d4a98926a69a31aabcbe331fa57f5bd030894 Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:42:53 +0200 Subject: [PATCH 2/5] 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 a91a24dfec..fe07b9d24d 100644 --- a/country.py +++ b/country.py @@ -29,9 +29,9 @@ class Country(ModelSQL, ModelView): @classmethod def search_rec_name(cls, name, clause): - if cls.search([('code',) + clause[1:]], limit=1): - return [('code',) + clause[1:]] - return [(cls._rec_name,) + clause[1:]] + if cls.search([('code',) + tuple(clause[1:])], limit=1): + return [('code',) + tuple(clause[1:])] + return [(cls._rec_name,) + tuple(clause[1:])] @classmethod def create(cls, vals): @@ -147,9 +147,9 @@ class Subdivision(ModelSQL, ModelView): @classmethod def search_rec_name(cls, name, clause): - if cls.search([('code',) + clause[1:]], limit=1): - return [('code',) + clause[1:]] - return [(cls._rec_name,) + clause[1:]] + if cls.search([('code',) + tuple(clause[1:])], limit=1): + return [('code',) + tuple(clause[1:])] + return [(cls._rec_name,) + tuple(clause[1:])] @classmethod def create(cls, vals): From 140739f0ace927c49653c0d0834e041e62eb9a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:33:29 +0100 Subject: [PATCH 3/5] Prepare release 2.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6d1399cd51..e5e7c54ba1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.1 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) From 27d28f0690c5455a0074fc8c3f98308da7b85148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:33:30 +0100 Subject: [PATCH 4/5] Added tag 2.6.1 for changeset ffe7538bb375 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 3dc4e544f0..926ff42f11 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ fadc4c9bfd476e840992273ea1d7c33f2a5eb656 1.4.0 4e14138f332644ff40cb46a395696f059758cce7 2.2.0 8879fc00f58df36d46692c2a19a2fd4c38742aa8 2.4.0 85501c92ab0b971d3ad4118d54d373e7cf225eb5 2.6.0 +ffe7538bb375eade4eb9e465cee846a37004ea61 2.6.1 From 0297f3a8e9a9f134cb5d8d349b00719d1ae87381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:33:54 +0100 Subject: [PATCH 5/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 9d690ee8f2..7c2ffa4700 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.1 +version=2.6.2 depends: ir res