From 9c4a783ebc1c80dade16df16a3f5db3de0fb2ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 11 May 2010 22:44:29 +0200 Subject: [PATCH 1/7] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 3f4d7acf5a..deb6299558 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Lista de precios de producto', 'name_es_ES': 'Lista de precios de producto', 'name_fr_FR' : 'Liste de prix produit', - 'version': '1.6.0', + 'version': '1.6.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From f24e9008fdc86b7db3ca0457f30853d73aa65e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 27 Dec 2010 16:55:07 +0100 Subject: [PATCH 2/7] Check formula must also check returned value is Decimal for issue1783 (transplanted from 2667adcc507b6003f9177e5ee53ade142739ba9e) --- price_list.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/price_list.py b/price_list.py index 1da2cb15e8..fff44aed2b 100644 --- a/price_list.py +++ b/price_list.py @@ -165,8 +165,9 @@ class PriceListLine(ModelSQL, ModelView): None, None, Decimal('0.0'), 0, None) for line in self.browse(cursor, user, ids): try: - self.get_unit_price(cursor, user, line, - context=context) + if not isinstance(self.get_unit_price(cursor, user, line, + context=context), Decimal): + return False except: return False return True From 6c0c50d4c8ef26c1a3432bb36af4777ec4369f3c Mon Sep 17 00:00:00 2001 From: Ian Wilson Date: Wed, 29 Dec 2010 15:15:59 -0800 Subject: [PATCH 3/7] Fix pool object in compute for issue1798. (transplanted from 2e2f15f0a035695672fbad636fb7fbff44386dd3) --- price_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/price_list.py b/price_list.py index fff44aed2b..391fe02414 100644 --- a/price_list.py +++ b/price_list.py @@ -84,7 +84,7 @@ class PriceList(ModelSQL, ModelView): party = party_obj.browse(cursor, user, party, context=context) if isinstance(product, (int, long)): - product = party_obj.browse(cursor, user, product, context=context) + product = product_obj.browse(cursor, user, product, context=context) if isinstance(uom, (int, long)): uom = uom_obj.browse(cursor, user, uom, context=context) From 594a11e3d598a5e58ceb72c1dbb4923e5797fbab Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 16:38:03 +0100 Subject: [PATCH 4/7] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 6e6811c885..1245dd594c 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2009-2010 Cédric Krier. -Copyright (C) 2009-2010 Bertrand Chenal. -Copyright (C) 2009-2010 B2CK SPRL. +Copyright (C) 2009-2011 Cédric Krier. +Copyright (C) 2009-2011 Bertrand Chenal. +Copyright (C) 2009-2011 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 67694cde584e535a79eeb4dbd2bf1677bb3ecab6 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:30:33 +0100 Subject: [PATCH 5/7] Prepare release 1.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 71af51bfa2..e787bd644b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.1 - 2011-02-13 +* Bug fixes (see mercurial logs for details) + Version 1.6.0 - 2010-05-11 * Bug fixes (see mercurial logs for details) From 6af53986009cf7b870eaf6e962800b871134c35a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:30:34 +0100 Subject: [PATCH 6/7] Added tag 1.6.1 for changeset 872d3232877f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4d6a981f1e..17a61d809e 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 6b8a2acf88fc3b594b049d4cc9d988f90ea7d7c1 1.4.0 0c2268414e42f760d201d503884ae4af4c1445c9 1.6.0 +872d3232877f635b7e9f14748b3fda47f87d9ae0 1.6.1 From c989aa2808be647a3b219dcb9e04c812f0e35c5a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:30:36 +0100 Subject: [PATCH 7/7] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index deb6299558..18ac09c08a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Lista de precios de producto', 'name_es_ES': 'Lista de precios de producto', 'name_fr_FR' : 'Liste de prix produit', - 'version': '1.6.1', + 'version': '1.6.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',