odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Quentin (OpenERP) 2014-01-21 09:49:46 +01:00
parent c3f087f795
commit e32b5bb6ae
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/mrp/procurement.py
View File

@ -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

14
addons/sale_mrp/sale_mrp.py
View File

@ -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)]}),
}