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

[Joao Alfredo Gama Batista]

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

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-07-23 08:44:52 +0000
+++ mrp/mrp.py	2012-08-09 15:41:24 +0000
@@ -789,7 +789,7 @@
             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
+                value = wc_line.delay * wc.costs_hour
                 account = wc.costs_hour_account_id.id
                 if value and account:
                     amount += value
@@ -801,7 +801,7 @@
                         'journal_id': wc.costs_journal_id.id,
                         'ref': wc.code,
                         'product_id': wc.product_id.id,
-                        'unit_amount': wc_line.hour,
+                        'unit_amount': wc_line.delay,
                         'product_uom_id': wc.product_id and wc.product_id.uom_id.id or False
                     } )
                 # Cost per cycle