diff --git a/addons/mrp/models/stock_rule.py b/addons/mrp/models/stock_rule.py
index 9c417efc312..755d2e93aed 100644
--- a/addons/mrp/models/stock_rule.py
+++ b/addons/mrp/models/stock_rule.py
@@ -90,8 +90,8 @@ class StockRule(models.Model):
             'location_dest_id': location_id.id,
             'bom_id': bom.id,
             'date_deadline': date_deadline,
-            'date_planned_finished': date_deadline,
-            'date_planned_start': fields.Datetime.from_string(date_deadline) - relativedelta(hours=1),
+            'date_planned_finished': fields.Datetime.from_string(values['date_planned']),
+            'date_planned_start': date_deadline,
             'procurement_group_id': False,
             'delay_alert': self.delay_alert,
             'propagate_cancel': self.propagate_cancel,
@@ -106,7 +106,10 @@ class StockRule(models.Model):
 
     def _get_date_planned(self, product_id, company_id, values):
         format_date_planned = fields.Datetime.from_string(values['date_planned'])
-        date_planned = format_date_planned - relativedelta(days=product_id.produce_delay or 0.0)
+        if product_id.produce_delay:
+            date_planned = format_date_planned - relativedelta(days=product_id.produce_delay)
+        else:
+            date_planned = format_date_planned - relativedelta(hours=1)
         date_planned = date_planned - relativedelta(days=company_id.manufacturing_lead)
         return date_planned