From 20922c82484993e926f18552dec8a7cbdc113d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 24 Oct 2011 23:21:17 +0200 Subject: [PATCH 01/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 18dfb705c8..94e1f65309 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version' : '2.2.0', + 'version' : '2.2.1', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 015a1344e0cf41387ec2c699b6b8ec734901905e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 28 Nov 2011 14:46:13 +0100 Subject: [PATCH 02/18] Fix Transaction.start to use keyword argument for context (transplanted from d2f919d970fb08f0da63127fc7e2f2bfd4919a27) --- tests/test_product.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/test_product.py b/tests/test_product.py index 63c7adec53..753e24db22 100644 --- a/tests/test_product.py +++ b/tests/test_product.py @@ -41,7 +41,8 @@ class ProductTestCase(unittest.TestCase): ''' Test uom non_zero_rate_factor constraint. ''' - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, + context=CONTEXT) as transaction: category_id = self.uom_category.create({'name': 'Test'}) transaction.cursor.commit() @@ -83,7 +84,8 @@ class ProductTestCase(unittest.TestCase): ''' Test uom check_factor_and_rate constraint. ''' - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, + context=CONTEXT) as transaction: category_id = self.uom_category.search([ ('name', '=', 'Test'), ], limit=1)[0] @@ -123,7 +125,7 @@ class ProductTestCase(unittest.TestCase): ('centimeter', 'rate'), ('Foot', 'factor'), ] - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, context=CONTEXT): for name, result in tests: uom_id = self.uom.search([ ('name', '=', name), @@ -143,7 +145,7 @@ class ProductTestCase(unittest.TestCase): ('Second', 25, 'Hour', 0.0069444444444444441, 0.01), ('Millimeter', 3, 'Inch', 0.11811023622047245, 0.12), ] - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, context=CONTEXT): for from_name, qty, to_name, result, rounded_result in tests: from_uom = self.uom.browse(self.uom.search( [ @@ -176,7 +178,7 @@ class ProductTestCase(unittest.TestCase): ('Second', Decimal('25'), 'Hour', Decimal('90000')), ('Millimeter', Decimal('3'), 'Inch', Decimal('76.2')), ] - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, context=CONTEXT): for from_name, price, to_name, result in tests: from_uom = self.uom.browse(self.uom.search( [ From 51ef0245df5c04ea5d9418da7e9252b7acf11d4e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:40:46 +0100 Subject: [PATCH 03/18] Prepare release 2.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 1ddd55414c..3ac43442ef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-24 * Bug fixes (see mercurial logs for details) From 9661a7ce2136b89b9ffef82e6deebfbeaa043a60 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:40:46 +0100 Subject: [PATCH 04/18] Added tag 2.2.1 for changeset dab6b5c68f93 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0255def2ca..9e0acc1dd1 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 69594771004e2cdf9544b66dfc0d5a573c733ca9 1.8.0 07fd0bfc7e48a52f3a9298c016704dcfbbb002da 2.0.0 6136f2cc33af280d251399d67399a2f6e854c9ca 2.2.0 +dab6b5c68f937e24995426e0d34b7b9f08f558dd 2.2.1 From 5d51090da0059774e048486f561505060702548a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:40:51 +0100 Subject: [PATCH 05/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 94e1f65309..462de08847 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version' : '2.2.1', + 'version': '2.2.2', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 1a64120adf17e03e71787bfd53ad18682004327e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 21 May 2012 12:42:04 +0200 Subject: [PATCH 06/18] Fix non zero rate unittest (transplanted from f4a6bbba2d2f49ebd00522b9ab17d01d54f7c823) --- tests/test_product.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_product.py b/tests/test_product.py index 753e24db22..2ed41a5d5c 100644 --- a/tests/test_product.py +++ b/tests/test_product.py @@ -64,17 +64,17 @@ class ProductTestCase(unittest.TestCase): }) transaction.cursor.commit() - self.failUnlessRaises(Exception, self.uom.write, { + self.failUnlessRaises(Exception, self.uom.write, category_id, { 'rate': 0.0, }) transaction.cursor.rollback() - self.failUnlessRaises(Exception, self.uom.write, { + self.failUnlessRaises(Exception, self.uom.write, category_id, { 'factor': 0.0, }) transaction.cursor.rollback() - self.failUnlessRaises(Exception, self.uom.write, { + self.failUnlessRaises(Exception, self.uom.write, category_id, { 'rate': 0.0, 'factor': 0.0, }) From 5980b73fb6613e2534718a3799d3c2b95e02d48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 1 Jun 2012 18:16:05 +0200 Subject: [PATCH 07/18] Re-fix non zero rate unittest (transplanted from 731488419ec4f5580397e292013a659949ec1d60) --- tests/test_product.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_product.py b/tests/test_product.py index 2ed41a5d5c..c3f5f9d9c2 100644 --- a/tests/test_product.py +++ b/tests/test_product.py @@ -64,17 +64,17 @@ class ProductTestCase(unittest.TestCase): }) transaction.cursor.commit() - self.failUnlessRaises(Exception, self.uom.write, category_id, { + self.failUnlessRaises(Exception, self.uom.write, uom_id, { 'rate': 0.0, }) transaction.cursor.rollback() - self.failUnlessRaises(Exception, self.uom.write, category_id, { + self.failUnlessRaises(Exception, self.uom.write, uom_id, { 'factor': 0.0, }) transaction.cursor.rollback() - self.failUnlessRaises(Exception, self.uom.write, category_id, { + self.failUnlessRaises(Exception, self.uom.write, uom_id, { 'rate': 0.0, 'factor': 0.0, }) From 50c9ae82c7f24e995f4f98558c725258bc0fd288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:33:05 +0200 Subject: [PATCH 08/18] Prepare release 2.2.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3ac43442ef..1fdc4b4094 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.2 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.2.1 - 2011-12-26 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index a9feb419c1..83c0f58495 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2012 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. -Copyright (C) 2008-2011 B2CK SPRL. +Copyright (C) 2008-2012 B2CK SPRL. Copyright (C) 2004-2008 Tiny SPRL. This program is free software: you can redistribute it and/or modify From 2bcf2941e78d23603f19d49ab2c99787f979f10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:33:07 +0200 Subject: [PATCH 09/18] Added tag 2.2.2 for changeset 569d26e8135d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9e0acc1dd1..b49b925dc6 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 07fd0bfc7e48a52f3a9298c016704dcfbbb002da 2.0.0 6136f2cc33af280d251399d67399a2f6e854c9ca 2.2.0 dab6b5c68f937e24995426e0d34b7b9f08f558dd 2.2.1 +569d26e8135d39367cc51c2bbbcd76ebb8ecd784 2.2.2 From c40cdf89c2ca4ac0f3d0d4130762b6e0a68344e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:33:15 +0200 Subject: [PATCH 10/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 462de08847..43d821e46a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version': '2.2.2', + 'version': '2.2.3', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From ec35590ca46c5f6a7066db2fd5232317c8ca570f 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 11/18] 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 9d6d957ff4..358dce0faa 100644 --- a/uom.py +++ b/uom.py @@ -127,8 +127,8 @@ class Uom(ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search(['OR', - (self._rec_name,) + clause[1:], - ('symbol',) + clause[1:], + (self._rec_name,) + tuple(clause[1:]), + ('symbol',) + tuple(clause[1:]), ], order=[]) return [('id', 'in', ids)] From 8585277ec64c97bf6e72ce084ebb3f86fd7eaaad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:38:54 +0200 Subject: [PATCH 12/18] Prepare release 2.2.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1fdc4b4094..c7722c4cb3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.3 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.2.2 - 2012-09-02 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 83c0f58495..244bb5d8dd 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2012 Cédric Krier. +Copyright (C) 2008-2013 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. -Copyright (C) 2008-2012 B2CK SPRL. +Copyright (C) 2008-2013 B2CK SPRL. Copyright (C) 2004-2008 Tiny SPRL. This program is free software: you can redistribute it and/or modify From 0a418a6e02694a8e2e5e922d36c405332f8bfbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:38:55 +0200 Subject: [PATCH 13/18] Added tag 2.2.3 for changeset 1ff68c15bd58 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b49b925dc6..8a6faf485f 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 6136f2cc33af280d251399d67399a2f6e854c9ca 2.2.0 dab6b5c68f937e24995426e0d34b7b9f08f558dd 2.2.1 569d26e8135d39367cc51c2bbbcd76ebb8ecd784 2.2.2 +1ff68c15bd580eff9748dffa0655dcb7c9c2de2d 2.2.3 From 7463cf7c131fcde3bb6daee168b5b3d0e0578b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:39:08 +0200 Subject: [PATCH 14/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 43d821e46a..d4182d7cd3 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version': '2.2.3', + 'version': '2.2.4', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4621661f045e7eafaa54407d072580ab7c78a4a0 Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:43:44 +0200 Subject: [PATCH 15/18] Fix domain concatenation between list and tuple issue3386 review1099002 (transplanted from d71945b5d54e9b61115ccb8c602958e9c78b0dbc) --- product.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/product.py b/product.py index ee3eac2ed9..831d5db27c 100644 --- a/product.py +++ b/product.py @@ -101,11 +101,11 @@ class Product(ModelSQL, ModelView): return res 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',) + clause[1:]] + return [('name',) + tuple(clause[1:])] def delete(self, ids): template_obj = Pool().get('product.template') From b892485ca6865a5caeef9343580e447dc8fc55e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:35:28 +0100 Subject: [PATCH 16/18] Prepare release 2.2.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c7722c4cb3..70bebeef24 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.4 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.2.3 - 2013-10-01 * Bug fixes (see mercurial logs for details) From 15a0af22992fe97246a0e24ea4828d8b32b28d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:35:29 +0100 Subject: [PATCH 17/18] Added tag 2.2.4 for changeset d251303f9f2c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8a6faf485f..f4622d9c48 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 dab6b5c68f937e24995426e0d34b7b9f08f558dd 2.2.1 569d26e8135d39367cc51c2bbbcd76ebb8ecd784 2.2.2 1ff68c15bd580eff9748dffa0655dcb7c9c2de2d 2.2.3 +d251303f9f2c82a527ebf111760841d450e7a5d6 2.2.4 From 09ab0de3726731c6a40b7dd5a0c8c10d35b59937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:35:43 +0100 Subject: [PATCH 18/18] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d4182d7cd3..e0925bc0c4 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version': '2.2.4', + 'version': '2.2.5', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',