From f8fe1864299de0f5aa5f30658a3fc6a84b471733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:21 +0200 Subject: [PATCH 01/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d1e768f0f3..125c6d74cc 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -12,7 +12,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 35445428f91e36e8a04c34ef0ef0cff1e002a3bb 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 02/15] 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 748f853515..88c7c520fa 100644 --- a/tests/test_product.py +++ b/tests/test_product.py @@ -66,17 +66,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 56172275b34abe16c791b735b8fdd26af8267b83 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 03/15] Re-fix non zero rate unittest (transplanted from 731488419ec4f5580397e292013a659949ec1d60) --- tests/test_product.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_product.py b/tests/test_product.py index 88c7c520fa..7fbfeebe02 100644 --- a/tests/test_product.py +++ b/tests/test_product.py @@ -57,7 +57,7 @@ class ProductTestCase(unittest.TestCase): }) transaction.cursor.rollback() - self.uom.create({ + uom_id = self.uom.create({ 'name': 'Test', 'symbol': 'T', 'category': category_id, @@ -66,17 +66,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 168205b1b0c2b449fd69f7de60c5c19d756b21b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 23 Aug 2012 23:18:16 +0200 Subject: [PATCH 04/15] Add missing default value for consumable issue2755 review477002 (transplanted from 73af8be8415d414644f3656b3bf44dc3956b3222) --- product.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/product.py b/product.py index 088d1868de..90114b152a 100644 --- a/product.py +++ b/product.py @@ -77,6 +77,9 @@ class Template(ModelSQL, ModelView): def default_type(self): return 'goods' + def default_consumable(self): + return False + def default_cost_price_method(self): return 'fixed' From 369cbd109d16eebc9f6bbeaf9d4d8d7a0fb69edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:31:59 +0200 Subject: [PATCH 05/15] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9c2ce5eccc..2d131e2aca 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.1 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.4.0 - 2012-04-24 * Bug fixes (see mercurial logs for details) * Remove special uom search clause From f07c1b3ab3c7dde7aa60e850bbc30381337fd35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:32:01 +0200 Subject: [PATCH 06/15] Added tag 2.4.1 for changeset ea23d740d2ed --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d5fa672b41..2f8458e06c 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 07fd0bfc7e48a52f3a9298c016704dcfbbb002da 2.0.0 6136f2cc33af280d251399d67399a2f6e854c9ca 2.2.0 bbaadb49d3a2043d116d95bfe839a34ea4c39b3e 2.4.0 +ea23d740d2ed926645935dc9143fc858f3b0fcd2 2.4.1 From 4e80413f49ddfa5c9079ac09dd16674bb52ca374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:32:09 +0200 Subject: [PATCH 07/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 125c6d74cc..1711711ea3 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -12,7 +12,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 1cca1a27f2acbd2813eb789c4ee7c2f1e5ce0c21 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 08/15] 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 04501a3d65..f9b6ee2591 100644 --- a/uom.py +++ b/uom.py @@ -105,8 +105,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 36ea5bfacb8efe23cbc3ac8f49f58ce3ee79f1c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:42:04 +0200 Subject: [PATCH 09/15] Prepare release 2.4.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2d131e2aca..933096bc9c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.2 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.4.1 - 2012-09-02 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index ede3facd44..6e948f6faf 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-2012 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 7a807fdd7db236012f1f9120c74c8420df137f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:42:05 +0200 Subject: [PATCH 10/15] Added tag 2.4.2 for changeset 7a14921fd70d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2f8458e06c..f96602a420 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 6136f2cc33af280d251399d67399a2f6e854c9ca 2.2.0 bbaadb49d3a2043d116d95bfe839a34ea4c39b3e 2.4.0 ea23d740d2ed926645935dc9143fc858f3b0fcd2 2.4.1 +7a14921fd70ddffdef40e452cb7585c794bd64ad 2.4.2 From 53c668488cae4c77df9fbe2521387767c0541094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:42:17 +0200 Subject: [PATCH 11/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1711711ea3..119efcecc4 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -12,7 +12,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version': '2.4.2', + 'version': '2.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From b1b8e53cc6e1919947ccff9a0d5890c95e9a9c11 Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:43:44 +0200 Subject: [PATCH 12/15] 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 90114b152a..fb1da29ea4 100644 --- a/product.py +++ b/product.py @@ -144,11 +144,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 ee8b8845fb310bf1b06179faa3af2b77054aad9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:20:39 +0100 Subject: [PATCH 13/15] Prepare release 2.4.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 933096bc9c..27f0a18bbe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.3 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.4.2 - 2013-10-01 * Bug fixes (see mercurial logs for details) From 8e782288b5e9f3cf7c5f0ccf6f69d3acae5a4915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:20:40 +0100 Subject: [PATCH 14/15] Added tag 2.4.3 for changeset 66e72ac59485 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f96602a420..9c13e9be57 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 bbaadb49d3a2043d116d95bfe839a34ea4c39b3e 2.4.0 ea23d740d2ed926645935dc9143fc858f3b0fcd2 2.4.1 7a14921fd70ddffdef40e452cb7585c794bd64ad 2.4.2 +66e72ac594858df17d6dd7b91931a76fa2498923 2.4.3 From 3f44029574a8ec51e8b454f931cb65ccb04082cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:20:55 +0100 Subject: [PATCH 15/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 119efcecc4..8f018cb444 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -12,7 +12,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version': '2.4.3', + 'version': '2.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',