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

[MERGE] OPW 575424: mrp: error on analytic entries when workcenter has no product 

bzr revid: odo@openerp.com-20120601143249-xkk2iog1l22kmz82
This commit is contained in:
Olivier Dony 2012-06-01 16:32:49 +02:00
parent 0f38eda522 94e03a2a25
commit e8ab2c3ae5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/mrp/mrp.py
View File

@ -786,6 +786,7 @@ class mrp_production(osv.osv):
for wc_line in production.workcenter_lines:
wc = wc_line.workcenter_id
if wc.costs_journal_id and wc.costs_general_account_id:
# Cost per hour
value = wc_line.hour * wc.costs_hour
account = wc.costs_hour_account_id.id
if value and account:
@ -799,9 +800,9 @@ class mrp_production(osv.osv):
'ref': wc.code,
'product_id': wc.product_id.id,
'unit_amount': wc_line.hour,
'product_uom_id': wc.product_id.uom_id.id
'product_uom_id': wc.product_id and wc.product_id.uom_id.id or False
} )
if wc.costs_journal_id and wc.costs_general_account_id:
# Cost per cycle
value = wc_line.cycle * wc.costs_cycle
account = wc.costs_cycle_account_id.id
if value and account:
@ -815,7 +816,7 @@ class mrp_production(osv.osv):
'ref': wc.code,
'product_id': wc.product_id.id,
'unit_amount': wc_line.cycle,
'product_uom_id': wc.product_id.uom_id.id
'product_uom_id': wc.product_id and wc.product_id.uom_id.id or False
} )
return amount