From 8ea86bbd61ff5cbe3e7044ac473dcab396f1eea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Apr 2013 12:27:08 +0200 Subject: [PATCH 01/10] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index ed6322943d..af2ad811a5 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.0 +version=2.8.1 depends: ir res From 6ecd952741539924fbe7151110897342e9900ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 8 Aug 2013 02:33:53 +0200 Subject: [PATCH 02/10] Fix domain concatenation between list and tuple (transplanted from 65f66a0e4f28f7d36e696387f999eb97ee6a3723) --- uom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uom.py b/uom.py index 3685ed675a..d8878fa029 100644 --- a/uom.py +++ b/uom.py @@ -121,8 +121,8 @@ class Uom(ModelSQL, ModelView): @classmethod def search_rec_name(cls, name, clause): ids = map(int, cls.search(['OR', - (cls._rec_name,) + clause[1:], - ('symbol',) + clause[1:], + (cls._rec_name,) + tuple(clause[1:]), + ('symbol',) + tuple(clause[1:]), ], order=[])) return [('id', 'in', ids)] From 1a620bdfcd64e1c79f744dbd2428010050c1328a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:54:01 +0200 Subject: [PATCH 03/10] Prepare release 2.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 212618ee9e..28df943d41 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.8.1 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.8.0 - 2013-04-22 * Bug fixes (see mercurial logs for details) From 653087feba1148fa235f5576297a5825730bd422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:54:02 +0200 Subject: [PATCH 04/10] Added tag 2.8.1 for changeset f7755af34eb9 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 67ef55e5ff..8a63e266f1 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 bbaadb49d3a2043d116d95bfe839a34ea4c39b3e 2.4.0 13bb103b0c306546e04650df7ef220788815940d 2.6.0 068ba300a88e92ba0006da1c3e4f38d55735d330 2.8.0 +f7755af34eb90e5a0acdabaf5d28bc3d57991f16 2.8.1 From ab7b240fe89f8d03a36d6afcec1fb30b55e8dbf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:54:14 +0200 Subject: [PATCH 05/10] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index af2ad811a5..a0e2fe7c98 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.1 +version=2.8.2 depends: ir res From c303dd3ad0f813e5ba0791ccb0da4be37a4a4e48 Mon Sep 17 00:00:00 2001 From: Priyanka Rani Date: Sat, 28 Sep 2013 17:30:25 +0530 Subject: [PATCH 06/10] Fix Product convert domain for non relate This Patch has fixed search domain conversion which converts domain like [('template.category', '=', 1)] to [('template', '=', 1)]. issue3118 review1056003 (transplanted from ef13861cf9508a8eaed14f977e5dc412a98c5db4) --- product.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/product.py b/product.py index b99a117ea2..dcb7541cf3 100644 --- a/product.py +++ b/product.py @@ -209,7 +209,9 @@ class Product(ModelSQL, ModelView): field = arg[0].split('.', 1)[0] if not getattr(cls, field, None): field = 'template.' + arg[0] - result.append((field,) + tuple(arg[1:])) + result.append((field,) + tuple(arg[1:])) + else: + result.append(arg) elif isinstance(arg, list): # sub-domain result.append(convert_domain(arg)) From e4dc4a45a8ca7da07f1307f5d57b9034edee5421 Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:43:44 +0200 Subject: [PATCH 07/10] Fix domain concatenation between list and tuple issue3386 review1099002 (transplanted from d71945b5d54e9b61115ccb8c602958e9c78b0dbc) --- product.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/product.py b/product.py index dcb7541cf3..12c4c8172f 100644 --- a/product.py +++ b/product.py @@ -152,12 +152,12 @@ class Product(ModelSQL, ModelView): @classmethod def search_rec_name(cls, name, clause): - ids = map(int, cls.search([('code',) + clause[1:]], order=[])) + ids = map(int, cls.search([('code',) + tuple(clause[1:])], order=[])) if ids: - ids += map(int, cls.search([('template.name',) + clause[1:]], - order=[])) + ids += map(int, + cls.search([('template.name',) + tuple(clause[1:])], order=[])) return [('id', 'in', ids)] - return [('template.name',) + clause[1:]] + return [('template.name',) + tuple(clause[1:])] def get_default_uom(self, name): return self.template.default_uom.id From 6c889df2d708a247e804aa76ac02a5da6b71ce99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:15:22 +0100 Subject: [PATCH 08/10] Prepare release 2.8.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 28df943d41..2c30339fd2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.8.2 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.8.1 - 2013-10-01 * Bug fixes (see mercurial logs for details) From 8b422f791128d40a80b6183ca04d482a31dacebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:15:23 +0100 Subject: [PATCH 09/10] Added tag 2.8.2 for changeset 2146ad4bd1cc --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8a63e266f1..0a0d14a142 100644 --- a/.hgtags +++ b/.hgtags @@ -9,3 +9,4 @@ bbaadb49d3a2043d116d95bfe839a34ea4c39b3e 2.4.0 13bb103b0c306546e04650df7ef220788815940d 2.6.0 068ba300a88e92ba0006da1c3e4f38d55735d330 2.8.0 f7755af34eb90e5a0acdabaf5d28bc3d57991f16 2.8.1 +2146ad4bd1ccb38ee66fdb6485740954a4468263 2.8.2 From bab8bf9fdb66adcbb69be688cbca3e107f0ae4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:16:29 +0100 Subject: [PATCH 10/10] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index a0e2fe7c98..88124eca99 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.8.2 +version=2.8.3 depends: ir res