Reviewers: ,
Please review this at http://codereview.tryton.org/593007/ Affected files: M CHANGELOG M purchase_request.py Index: CHANGELOG =================================================================== --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* find_best_supplier doesn't optimize anymore on the delivery delay + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) * Generate also purchase requests for assets Index: purchase_request.py =================================================================== --- a/purchase_request.py +++ b/purchase_request.py @@ -331,21 +331,13 @@ Date = Pool().get('ir.date') supplier = None - timedelta = datetime.timedelta.max today = Date.today() for product_supplier in product.product_suppliers: supply_date = product_supplier.compute_supply_date(date=today) - sup_timedelta = date - supply_date - if not supplier: + timedelta = date - supply_date + if not supplier and timedelta >= datetime.timedelta(0): supplier = product_supplier.party - timedelta = sup_timedelta - continue - - if timedelta < datetime.timedelta(0) \ - and (sup_timedelta >= datetime.timedelta(0) \ - or sup_timedelta > timedelta): - supplier = product_supplier.party - timedelta = sup_timedelta + break if supplier: purchase_date = product_supplier.compute_purchase_date(date) -- -- [email protected] mailing list
