Merge lp:~savoirfairelinux-openerp/openobject-addons/6.1-bug-1021788-joao-gama into lp:openobject-addons/6.1

Proposed by Joao Alfredo Gama Batista
Status: Needs review
Proposed branch: lp:~savoirfairelinux-openerp/openobject-addons/6.1-bug-1021788-joao-gama
Merge into: lp:openobject-addons/6.1
Diff against target: 21 lines (+2/-2)
1 file modified
mrp/mrp.py (+2/-2)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-addons/6.1-bug-1021788-joao-gama
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+118986@code.launchpad.net

Description of the change

This is a backport (trunk -> 6.1) of the bug fixed in this branch lp:~openerp-dev/openobject-addons/trunk-bug-1021788-jir

To post a comment you must log in.

Unmerged revisions

6932. By Joao Alfredo Gama Batista

[FIX] Backported the fix provided by this branch (lp:~openerp-dev/openobject-addons/trunk-bug-1021788-jir) to the 6.1 branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mrp/mrp.py'
2--- mrp/mrp.py 2012-07-23 08:44:52 +0000
3+++ mrp/mrp.py 2012-08-09 15:41:24 +0000
4@@ -789,7 +789,7 @@
5 wc = wc_line.workcenter_id
6 if wc.costs_journal_id and wc.costs_general_account_id:
7 # Cost per hour
8- value = wc_line.hour * wc.costs_hour
9+ value = wc_line.delay * wc.costs_hour
10 account = wc.costs_hour_account_id.id
11 if value and account:
12 amount += value
13@@ -801,7 +801,7 @@
14 'journal_id': wc.costs_journal_id.id,
15 'ref': wc.code,
16 'product_id': wc.product_id.id,
17- 'unit_amount': wc_line.hour,
18+ 'unit_amount': wc_line.delay,
19 'product_uom_id': wc.product_id and wc.product_id.uom_id.id or False
20 } )
21 # Cost per cycle