[MERGE] forward port of branch 8.0 up to fe15829

addons/sale/sale.py

@@ -249,6 +249,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)

addons/sale_stock/sale_stock.py

@@ -110,6 +110,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:

addons/stock/stock.py

@@ -3892,6 +3892,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):

addons/website_quote/models/order.py

@@ -225,7 +225,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 = []