diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index d0f4c9f01fb..55b3260c170 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -945,6 +945,17 @@ + + procurement.rule.form.stock.inherit.mrp + procurement.rule + + + + {'required': [('action', '=', 'move')], 'invisible': [('action', 'not in', ['move', 'manufacture'])]} + + + + procurement.order.form.inherit procurement.order diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py index 2fe68135c54..35b1153a7d1 100644 --- a/addons/mrp/procurement.py +++ b/addons/mrp/procurement.py @@ -77,7 +77,7 @@ class procurement_order(osv.osv): 'product_id': procurement.product_id.id, 'product_qty': procurement.product_qty, 'product_uom': procurement.product_uom.id, - 'location_src_id': procurement.location_id.id, + 'location_src_id': procurement.rule_id.location_src_id.id or procurement.location_id.id, 'location_dest_id': procurement.location_id.id, 'bom_id': bom_id, 'routing_id': routing_id,