From 02f804d17ca8abc939120cf32c979cd13b9cb72b Mon Sep 17 00:00:00 2001 From: Nathanael Perat Date: Tue, 29 Nov 2011 17:13:53 +0100 Subject: [PATCH] Fix compute_purchase_date for stock_supply_day issue 1977 review 183001 --- 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)