From c8ebd1ae64b1ea1b8d75838d38e992287b83001a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:48:53 +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 9b013469ab..b94b0d2de4 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ "name_es_CO" : "Existencias por días de la semana", "name_es_ES" : "Suministro de existencias por días de la semana", "name_fr_FR" : "Approvisionnement par jours de semaine", - "version" : "2.0.0", + "version" : "2.0.1", "author" : "B2CK", 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9334b0eca7a0fd811039dbf732244209b10b884e Mon Sep 17 00:00:00 2001 From: Nathanael Perat Date: Tue, 29 Nov 2011 17:13:53 +0100 Subject: [PATCH 2/5] Fix compute_purchase_date for stock_supply_day issue 1977 review 183001 (transplanted from aa6d2c8c1259fb3dd02cc4b1d1f3ce172eef390c) --- purchase.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/purchase.py b/purchase.py index aff7542e92..e80660a0c6 100644 --- a/purchase.py +++ b/purchase.py @@ -34,18 +34,16 @@ class ProductSupplier(ModelSQL, ModelView): return res def compute_purchase_date(self, product_supplier, date): - earlier_date = None + later_date = None for day in product_supplier.weekdays: weekday = int(day.weekday) - diff = date.weekday() - weekday - if diff > 0: - diff -= 7 - new_date = date + datetime.timedelta(diff) - if earlier_date and earlier_date <= new_date: + diff = (date.weekday() - weekday) % 7 + new_date = date - datetime.timedelta(diff) + if later_date and later_date >= new_date: continue - earlier_date = new_date - if earlier_date: - date = earlier_date + later_date = new_date + if later_date: + date = later_date return super(ProductSupplier, self).compute_purchase_date( product_supplier, date) From 22ce82e2bd6d8f0ae0129872f070e1c34d6d7e3b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:38:52 +0100 Subject: [PATCH 3/5] Prepare release 2.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2eaa32ca10..c7bb8caabc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 2.0.0 - 2011-04-27 * Bug fixes (see mercurial logs for details) From 058f8f0d2035676787cb90c6ac3a36a100ae6342 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:38:53 +0100 Subject: [PATCH 4/5] Added tag 2.0.1 for changeset cffb7a7af7fe --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 845047d5ef..57fe00e237 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ 2dfd00186d72076cf13379297e19c076884078d9 1.6.0 056794451985f57a11e3cd7eba52f596ee9ec735 1.8.0 bd08fecfa2cf0e7e3580c85090f62e1711fcfb88 2.0.0 +cffb7a7af7fe8c4e1314c1e88355406898d321cd 2.0.1 From 4e2ab2246d7a5f2926d76bf746cade4bd54d6101 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:46:42 +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 b94b0d2de4..33a9168179 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ "name_es_CO" : "Existencias por días de la semana", "name_es_ES" : "Suministro de existencias por días de la semana", "name_fr_FR" : "Approvisionnement par jours de semaine", - "version" : "2.0.1", + "version" : "2.0.2", "author" : "B2CK", 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',