From 5d47f68fd9980f3c8b13622ca302a4236dbc9161 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Fri, 11 Aug 2017 10:19:08 +0200 Subject: [PATCH] [FIX] sale, sale_stock: date planned That shouldn't have been merged. Oops. This reverts commit ce8ed1c007eabaa0698901a3d703fbe85d42bd27. --- addons/sale/models/sale.py | 2 +- addons/sale_stock/models/sale_order.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index 7c653a3fda1..38a4036f609 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -635,7 +635,7 @@ class SaleOrderLine(models.Model): return { 'name': self.name, 'origin': self.order_id.name, - 'date_planned': datetime.strptime(self.order_id.confirmation_date, DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(days=self.customer_lead), + 'date_planned': datetime.strptime(self.order_id.date_order, DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(days=self.customer_lead), 'product_id': self.product_id.id, 'product_qty': self.product_uom_qty, 'product_uom': self.product_uom.id, diff --git a/addons/sale_stock/models/sale_order.py b/addons/sale_stock/models/sale_order.py index e405bd3562b..df9838ba1f7 100644 --- a/addons/sale_stock/models/sale_order.py +++ b/addons/sale_stock/models/sale_order.py @@ -162,7 +162,7 @@ class SaleOrderLine(models.Model): @api.multi def _prepare_order_line_procurement(self, group_id=False): vals = super(SaleOrderLine, self)._prepare_order_line_procurement(group_id=group_id) - date_planned = datetime.strptime(self.order_id.confirmation_date, DEFAULT_SERVER_DATETIME_FORMAT)\ + date_planned = datetime.strptime(self.order_id.date_order, DEFAULT_SERVER_DATETIME_FORMAT)\ + timedelta(days=self.customer_lead or 0.0) - timedelta(days=self.order_id.company_id.security_lead) vals.update({ 'date_planned': date_planned.strftime(DEFAULT_SERVER_DATETIME_FORMAT),