From 8cca5dd11b3e27338fe818b9599186a7ed23e783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Apr 2011 21:30:49 +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 7f693bedfd..bc8039e367 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version' : '2.0.0', + 'version' : '2.0.1', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 09c0dfd8abcf404fb5cdaa8a613b4cfdecaceaf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Apr 2011 21:26:57 +0200 Subject: [PATCH 02/18] Add missing icons (transplanted from 002a971a0a39530681a67cf24f03253339c419f0) --- icons/__init__.py | 0 setup.py | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 icons/__init__.py diff --git a/icons/__init__.py b/icons/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/setup.py b/setup.py index afc69b8a5e..f8f3f08d86 100644 --- a/setup.py +++ b/setup.py @@ -31,10 +31,12 @@ setup(name='trytond_product', packages=[ 'trytond.modules.product', 'trytond.modules.product.tests', + 'trytond.modules.product.icons', ], package_data={ 'trytond.modules.product': info.get('xml', []) \ + info.get('translation', []), + 'trytond.modules.product.icons': ['tryton-product.svg'], }, classifiers=[ 'Development Status :: 5 - Production/Stable', From 013e5615f0434032c2ab979da06384ac48d5ae51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Apr 2011 21:32:14 +0200 Subject: [PATCH 03/18] Prepare release 2.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 755dd5bb48..faf7afc868 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2011-04-26 +* Add missing icons + Version 2.0.0 - 2011-04-26 * Bug fixes (see mercurial logs for details) From 927691ebdf531243e95064fa6473e82fb9e4e04b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Apr 2011 21:32:21 +0200 Subject: [PATCH 04/18] Added tag 2.0.1 for changeset e2cc6a2e76b9 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d8d84086ed..40ca769ba0 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 0021ba35067abe399cfc84de2e87ac7687fa44c4 1.6.0 69594771004e2cdf9544b66dfc0d5a573c733ca9 1.8.0 07fd0bfc7e48a52f3a9298c016704dcfbbb002da 2.0.0 +e2cc6a2e76b9186165b218f095b6378757650ba2 2.0.1 From 8c181e9a429a4d859f018b3a70149cc8d0cb367a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:48:30 +0200 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 bc8039e367..8f63f5c634 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version' : '2.0.1', + 'version' : '2.0.2', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 7677f03c49386244acdbc21368fdd00fbc874424 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 fad01cc416..e8a65b1010 100644 --- a/tests/test_product.py +++ b/tests/test_product.py @@ -57,17 +57,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 e8651d69d0bd3c5d7ba20d188f8d79c135c8f942 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 e8a65b1010..d5f2ab6cea 100644 --- a/tests/test_product.py +++ b/tests/test_product.py @@ -57,17 +57,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 f59cf0ae827c24145abb4127061f463ad47276b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:34:06 +0200 Subject: [PATCH 08/18] Prepare release 2.0.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index faf7afc868..e42d6fbc62 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.2 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.0.1 - 2011-04-26 * Add missing icons 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 79f4c37b690d39ecead2a0ac80bf93fc5d1c2dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:34:07 +0200 Subject: [PATCH 09/18] Added tag 2.0.2 for changeset 895697eb9021 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 40ca769ba0..ad21d17ac3 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 69594771004e2cdf9544b66dfc0d5a573c733ca9 1.8.0 07fd0bfc7e48a52f3a9298c016704dcfbbb002da 2.0.0 e2cc6a2e76b9186165b218f095b6378757650ba2 2.0.1 +895697eb902196b7a671258cf738929264607d5c 2.0.2 From 92a4418fed78dc682cfce2afe569e2c851011318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 2 Sep 2012 16:36:32 +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 8f63f5c634..fdb937908f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version' : '2.0.2', + 'version': '2.0.3', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 3f6947234e8b12f09c3016f05ebc111f1d1459e1 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 a530902382..d4318f8fe8 100644 --- a/uom.py +++ b/uom.py @@ -125,8 +125,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 9ffb58488f35bc8ffcfb0ae27b62aed75eb921d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:33:21 +0200 Subject: [PATCH 12/18] Prepare release 2.0.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e42d6fbc62..a7b13805cd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.3 - 2013-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.0.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 33b3ba8d30fa4b152933cfb622b07144d75c79b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:33:22 +0200 Subject: [PATCH 13/18] Added tag 2.0.3 for changeset 9726ca1e8072 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index ad21d17ac3..2c00382f9e 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 07fd0bfc7e48a52f3a9298c016704dcfbbb002da 2.0.0 e2cc6a2e76b9186165b218f095b6378757650ba2 2.0.1 895697eb902196b7a671258cf738929264607d5c 2.0.2 +9726ca1e807268d340cba0ceae0bf6deaa946f36 2.0.3 From 63739b662528a8e91053ac27cc3857c067a1faad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Oct 2013 21:33:34 +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 fdb937908f..c3834445f7 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version': '2.0.3', + 'version': '2.0.4', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 1283bc4da254009d9fa18a46c4879f487adb6cb5 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 92fe4f5ca9..3dc76f8f5b 100644 --- a/product.py +++ b/product.py @@ -98,11 +98,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 = self.pool.get('product.template') From b6342ce003b5f2151f262d282535e7dd36c5be3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:39:48 +0100 Subject: [PATCH 16/18] Prepare release 2.0.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a7b13805cd..0e8f6cb5ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.4 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.0.3 - 2013-10-01 * Bug fixes (see mercurial logs for details) From 9f6d957fa4c06ef81c18bd0e5953c5aae5b9c889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:39:49 +0100 Subject: [PATCH 17/18] Added tag 2.0.4 for changeset 931fdf52b913 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2c00382f9e..9102c30121 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ f842ba7aea91b52a34fe80ed0739f8e3cba80c7f 1.4.0 e2cc6a2e76b9186165b218f095b6378757650ba2 2.0.1 895697eb902196b7a671258cf738929264607d5c 2.0.2 9726ca1e807268d340cba0ceae0bf6deaa946f36 2.0.3 +931fdf52b913e95b6b3802ea82aa682aec4e5cbd 2.0.4 From 9fd67c63899fbdf9595f62e2d4a0cabaad9e3236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 18:40:01 +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 c3834445f7..8ee9a30364 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -10,7 +10,7 @@ 'name_fr_FR': 'Produit', 'name_nl_NL': 'Producten', 'name_ru_RU': 'ТМЦ', - 'version': '2.0.4', + 'version': '2.0.5', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',