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

[REV] mrp_byproduct: partial revert of fix early made which, i guess, was wrongly removing a bunch of needed code 

bzr revid: qdp-launchpad@openerp.com-20140422121625-iv3bqaoww6ty8cwp
This commit is contained in:
Quentin (OpenERP) 2014-04-22 14:16:25 +02:00
parent 57e78c2846
commit b342f897ae
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/mrp_byproduct/mrp_byproduct.py
View File

@ -92,18 +92,21 @@ class mrp_production(osv.osv):
continue
for sub_product in production.bom_id.sub_products:
product_uom_factor = product_uom_obj._compute_qty(cr, uid, production.product_uom.id, production.product_qty, production.bom_id.product_uom.id)
qty1 = sub_product.product_qty
qty2 = production.product_uos and production.product_uos_qty or False
product_uos_factor = 0.0
if qty2 and production.bom_id.product_uos.id:
product_uos_factor = product_uom_obj._compute_qty(cr, uid, production.product_uos.id, production.product_uos_qty, production.bom_id.product_uos.id)
if sub_product.subproduct_type == 'variable':
if production.product_qty:
qty1 *= product_uom_factor / (production.bom_id.product_qty or 1.0)
if production.product_uos_qty:
qty2 *= product_uos_factor / (production.bom_id.product_uos_qty or 1.0)
data = {
'name': 'PROD:'+production.name,
'date': production.date_planned,
'product_id': sub_product.product_id.id,
'product_uom_qty': production.product_qty,
'product_uom_qty': qty1,
'product_uom': sub_product.product_uom.id,
'product_uos_qty': qty2,
'product_uos': production.product_uos and production.product_uos.id or False,