From e8e79569937d59d8a4285072fc49983d797a7520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 13 May 2010 16:58:47 +0200 Subject: [PATCH 1/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b9368f4a31..17f7ea6d2b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Lista de Precios de Venta', 'name_es_ES': 'Lista de precios de venta', 'name_fr_FR' : 'Listes de prix de vente', - 'version': '1.6.0', + 'version': '1.6.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 5afedff8d9cdce40f845b126d435f35807dbcacf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 3 Jun 2010 19:53:40 +0200 Subject: [PATCH 2/5] Add missing price_list for on_change of unit (transplanted from 7c91fec15f7a5dadf0a631342451fbbfdd462ad9) --- sale.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sale.py b/sale.py index 29e2b7f2fb..2e019ad568 100644 --- a/sale.py +++ b/sale.py @@ -55,6 +55,10 @@ class SaleLine(ModelSQL, ModelView): self.quantity = copy.copy(self.quantity) self.quantity.on_change = copy.copy(self.quantity.on_change) self.quantity.on_change.append('_parent_sale.price_list') + if '_parent_sale.price_list' not in self.unit.on_change: + self.unit = copy.copy(self.unit) + self.unit.on_change = copy.copy(self.unit.on_change) + self.unit.on_change.append('_parent_sale.price_list') if '_parent_sale.price_list' not in self.product.on_change: self.product = copy.copy(self.product) self.product.on_change = copy.copy(self.product.on_change) From 49284f1567c15748cddc42b10ead13241e0e2123 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:28 +0100 Subject: [PATCH 3/5] Prepare release 1.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6175416a65..80237d3d9b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.1 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.6.0 - 2010-05-13 * Bug fixes (see mercurial logs for details) From 09b7bf0f16ff06846cd0f96a35e78ce82bc8dc83 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:28 +0100 Subject: [PATCH 4/5] Added tag 1.6.1 for changeset 8cd8a61aaca4 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9347724113..47af363d6d 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ ab27d5f885523aea9a019286456f0d1e5e8004ce 1.4.0 f9b3c65cec15cb254f0dabd277267713b27ac85e 1.6.0 +8cd8a61aaca48aa49ba31f22b563e36f59fc793a 1.6.1 From 4c0a27b721f36133a84f4014a30bc808d9e1b41b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13:29 +0100 Subject: [PATCH 5/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 17f7ea6d2b..15138b7949 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Lista de Precios de Venta', 'name_es_ES': 'Lista de precios de venta', 'name_fr_FR' : 'Listes de prix de vente', - 'version': '1.6.1', + 'version': '1.6.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',