From c77745b9c5ccb641805c74dadc51d838b94ec077 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 20 Jun 2016 13:50:58 +0200
Subject: [PATCH 1/2] [FIX] sale, slae_stock, website_quote: get sale_delay in
 onchange_template_id

Inspired from a706ada

opw:681245, 681289, 681285
---
 addons/sale/sale.py                  | 3 +++
 addons/sale_stock/sale_stock.py      | 6 ++++++
 addons/website_quote/models/order.py | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6cafd72510e..9ca0a33ac84 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -269,6 +269,9 @@ class sale_order(osv.osv):
     ]
     _order = 'date_order desc, id desc'
 
+    def _get_customer_lead(self, cr, uid, product_tmpl_id):
+        return False
+
     # Form filling
     def unlink(self, cr, uid, ids, context=None):
         sale_orders = self.read(cr, uid, ids, ['state'], context=context)
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index f869d157432..4c943325f6a 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -102,6 +102,12 @@ class sale_order(osv.osv):
         'picking_policy': 'direct',
         'order_policy': 'manual',
     }
+
+    #FORWARDPORT UP TO SAAS-6
+    def _get_customer_lead(self, cr, uid, product_tmpl_id):
+        super(sale_order, self)._get_customer_lead(cr, uid, product_tmpl_id)
+        return product_tmpl_id.sale_delay
+
     def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context=None):
         val = {}
         if warehouse_id:
diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py
index d6d78cc80a5..1120cc3ee6b 100644
--- a/addons/website_quote/models/order.py
+++ b/addons/website_quote/models/order.py
@@ -185,7 +185,7 @@ class sale_order(osv.osv):
                 'product_uom': line.product_uom_id.id,
                 'website_description': line.website_description,
                 'state': 'draft',
-                'delay': line.product_id.sale_delay
+                'delay': self.pool['sale.order']._get_customer_lead(cr, uid, line.product_id.product_tmpl_id)
             })
             lines.append((0, 0, data))
         options = []

From fe15829c1664c00bc64874af4f504eaffbe1c12f Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 13 Jun 2016 23:38:12 +0200
Subject: [PATCH 2/2] [IMP] stock: when applying a push rule the new move
 should not be linked to the same procurement anymore

---
 addons/stock/stock.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f13a208e58c..40f3f4a2b43 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3832,6 +3832,7 @@ class stock_location_path(osv.osv):
                 'propagate': rule.propagate,
                 'push_rule_id': rule.id,
                 'warehouse_id': rule.warehouse_id and rule.warehouse_id.id or False,
+                'procurement_id': False,
             }
 
     def _apply(self, cr, uid, rule, move, context=None):