[FIX] sale_mrp; fixed error in yaml test. It seems we forgot the property_ids field on sale.order.line -_- . Also removed a unused method (_prepare_order_line_procurement on procurement order => this must be/is already defined in sale.order object)

bzr revid: qdp-launchpad@openerp.com-20140121084946-8aws5axdkgr8ng9r

2 files changed, 11 insertions, 8 deletions

diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 622a669bb1f..2768007a0a8 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -56,11 +56,6 @@ class procurement_order(osv.osv):
             return True
         return super(procurement_order, self)._check(cr, uid, procurement, context=context)
 
-    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
-        result = super(procurement_order, self)._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, context)
-        result['property_ids'] = [(6, 0, [x.id for x in line.property_ids])]
-        return result
-
     def check_bom_exists(self, cr, uid, ids, context=None):
         """ Finds the bill of material for the product from procurement order.
         @return: True or False
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index dfcb8222d0f..1852326c86f 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -74,8 +74,8 @@ class mrp_production(osv.osv):
             if move.move_dest_id:
                 return get_parent_move(move.move_dest_id)
             return move
-        
-        res =  super(mrp_production, self)._hook_create_post_procurement(cr, uid, production, procurement_id, context)
+
+        res = super(mrp_production, self)._hook_create_post_procurement(cr, uid, production, procurement_id, context)
         if production.move_prod_id:
             parent_move_line = get_parent_move(production.move_prod_id)
             if parent_move_line and parent_move_line.sale_line_id:
@@ -89,9 +89,17 @@ class mrp_production(osv.osv):
 
 
 class sale_order(osv.Model):
-    _inherit ='sale.order'
+    _inherit = 'sale.order'
 
     def _prepare_order_line_procurement(self, cr, uid, order, line, group_id=False, context=None):
         result = super(sale_order, self)._prepare_order_line_procurement(cr, uid, order, line, group_id=group_id, context=context)
         result['property_ids'] = [(6, 0, [x.id for x in line.property_ids])]
         return result
+
+
+class sale_order_line(osv.osv):
+
+    _inherit = 'sale.order.line'
+    _columns = {
+        'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
+    }