diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 1b797290632..0fd9bce43ae 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -70,7 +70,6 @@ class sale_order(osv.osv):
'product_id': grid.carrier_id.product_id.id,
'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
'tax_id': [(6,0,taxes_ids)],
- 'type': 'make_to_stock'
})
#remove the value of the carrier_id field on the sale order
return self.write(cr, uid, ids, {'carrier_id': False}, context=context)
diff --git a/addons/delivery/test/delivery_cost.yml b/addons/delivery/test/delivery_cost.yml
index 34ecb165ee1..c84f81fa6e1 100644
--- a/addons/delivery/test/delivery_cost.yml
+++ b/addons/delivery/test/delivery_cost.yml
@@ -61,5 +61,4 @@
{}
-
!python {model: sale.config.settings}: |
- self.execute(cr, uid, [ref('default_delivery_policy')], context=context)
-
+ self.execute(cr, uid, [ref('default_delivery_policy')], context=context)
\ No newline at end of file
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 8d7d54d9640..4521bb0e59b 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -18,7 +18,6 @@
450
2
2
- make_to_stock
@@ -28,7 +27,6 @@
90
3
3
- make_to_stock
diff --git a/addons/stock_complex_routes/test/dropship.yml b/addons/stock_complex_routes/test/dropship.yml
index 738460d27a1..181166e96ff 100644
--- a/addons/stock_complex_routes/test/dropship.yml
+++ b/addons/stock_complex_routes/test/dropship.yml
@@ -45,16 +45,11 @@
sale_record = self.pool.get("sale.order").browse(cr, uid, ref('sale_order_drp_shpng'))
procurement_order = self.pool.get("procurement.group").browse(cr, uid, sale_record.procurement_group_id.id).procurement_ids[0]
purchase_id = procurement_order.purchase_line_id.order_id.id
+
wf_service = netsvc.LocalService('workflow')
wf_service.trg_validate(uid, 'purchase.order', purchase_id, 'purchase_confirm', cr)
--
- Use 'Receive Products' button to immediately view this picking, it should have created a picking with 200 pieces
--
- !python {model: purchase.order}: |
- sale_record = self.pool.get("sale.order").browse(cr, uid, ref('sale_order_drp_shpng'))
- procurement_order = self.pool.get("procurement.group").browse(cr, uid, sale_record.procurement_group_id.id).procurement_ids[0]
- purchase_id = procurement_order.purchase_line_id.order_id.id
- self.view_picking(cr, uid, [purchase_id])
+ print self.browse(cr, uid, purchase_id).state
+ assert self.browse(cr, uid, purchase_id).state == 'approved', 'Purchase order should be in the approved state'
-
Send the 200 pieces.
-