From 3103b62a2fb110ec8b3fe7f79522c6831feea14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Nov 2010 13:43:00 +0100 Subject: [PATCH 1/8] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index dfc9169771..58e4d52b56 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.8.0', + 'version': '1.8.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 3c7cc18d534c865b0972d20778b955458b9feee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 13 Nov 2010 17:00:26 +0100 Subject: [PATCH 2/8] Add missing set_context when checking formula (transplanted from f5fdff0444a804625e41d2b7f56908f9f9cd8928) --- price_list.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/price_list.py b/price_list.py index 32c7f1da6c..1a113ecb60 100644 --- a/price_list.py +++ b/price_list.py @@ -153,11 +153,13 @@ class PriceListLine(ModelSQL, ModelView): price_list_obj = self.pool.get('product.price_list') context = price_list_obj._get_context_price_list_line(None, None, Decimal('0.0'), 0, None) - for line in self.browse(ids): - try: - self.get_unit_price(line) - except Exception: - return False + lines = self.browse(ids) + with Transaction().set_context(**context): + for line in lines: + try: + self.get_unit_price(line) + except Exception: + return False return True def match(self, line, pattern): From 80a696cfc4b39dbfa6a334c14bd163f1d1aa330a 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 3/8] Check formula must also check returned value is Decimal for issue1783 (transplanted from 2667adcc507b6003f9177e5ee53ade142739ba9e) --- price_list.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/price_list.py b/price_list.py index 1a113ecb60..b8c92895d6 100644 --- a/price_list.py +++ b/price_list.py @@ -157,7 +157,8 @@ class PriceListLine(ModelSQL, ModelView): with Transaction().set_context(**context): for line in lines: try: - self.get_unit_price(line) + if not isinstance(self.get_unit_price(line), Decimal): + return False except Exception: return False return True From fa219e7cd8c1b2832bb72c3befe0b334092365da Mon Sep 17 00:00:00 2001 From: Ian Wilson Date: Wed, 29 Dec 2010 15:15:59 -0800 Subject: [PATCH 4/8] 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 b8c92895d6..34374327bc 100644 --- a/price_list.py +++ b/price_list.py @@ -76,7 +76,7 @@ class PriceList(ModelSQL, ModelView): party = party_obj.browse(party) if isinstance(product, (int, long)): - product = party_obj.browse(product) + product = product_obj.browse(product) if isinstance(uom, (int, long)): uom = uom_obj.browse(uom) From 797db499c38da7c4ad53369453be8e3d18557743 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 16:32:03 +0100 Subject: [PATCH 5/8] 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 f5bea700cb70926a01fdd172a4afb43a20409a19 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:32:01 +0100 Subject: [PATCH 6/8] Prepare release 1.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3ecb7d4868..7b3896af74 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.1 - 2011-02-13 +* Bug fixes (see mercurial logs for details) + Version 1.8.0 - 2010-11-01 * Bug fixes (see mercurial logs for details) From f5ac99a8929d0e33159a144f644a717a733f7872 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:32:02 +0100 Subject: [PATCH 7/8] Added tag 1.8.1 for changeset f2c6c7b4896f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 3a1311d858..b7585f4c9e 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 6b8a2acf88fc3b594b049d4cc9d988f90ea7d7c1 1.4.0 0c2268414e42f760d201d503884ae4af4c1445c9 1.6.0 f5dbbd2c4ac2c879d121cb3397d30ee247c79a87 1.8.0 +f2c6c7b4896f6f66f5e13e49668c99c88f0790d4 1.8.1 From 323fd781d8f38ba19c9a7617f78f2e19e9039341 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:32:05 +0100 Subject: [PATCH 8/8] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 58e4d52b56..6a36c88ce7 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.8.1', + 'version': '1.8.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',