diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 52f9f018841..082323ad580 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -90,3 +90,13 @@ class sale_order_line(osv.osv):
_columns = {
'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
}
+
+
+class stock_move(osv.osv):
+ _inherit = 'stock.move'
+
+ def _prepare_procurement_from_move(self, cr, uid, move, context=None):
+ res = super(stock_move, self)._prepare_procurement_from_move(cr, uid, move, context=context)
+ if res and move.procurement_id and move.procurement_id.property_ids:
+ res['property_ids'] = [(6, 0, [x.id for x in move.procurement_id.property_ids])]
+ return res
diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index 3c2771f55a5..71e0aada1ea 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -16,5 +16,18 @@
+
+ sale.order.form.sale.stock.mrp
+ sale.order
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 48e41f9f28c..f3db20171b4 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -62,10 +62,6 @@
days
-