Merge lp:~openerp-dev/openobject-addons/trunk-bug-1021788-jir into lp:openobject-addons

[Jignesh Rathod(OpenERP)]

Hello ,

Solve the problem of workorder costing.currently workorder costing
calculate base on number of hours instead of working hours and it should be based on
working hours.

Thank you.

[lp:~openerp-dev/openobject-addons/trunk-bug-1021788-jir]

7009. By jir <jir@jir-desktop> on 2012-07-10

[FIX] Solve the problem of workordercosting.

[Amit Parik (amit-parik)]

Good work!

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-1021788-jir]

7010. By Jignesh Rathod(OpenERP) on 2012-08-23

[MERGE]: Merge with lp:openobject-addons

[Amit Parik (amit-parik)]

Hello Jignesh,

It should be fixed on mrp_opertation.py not on mrp.py.

Thanks!

[Amit Parik (amit-parik)]

review: Needs Fixing

Unmerged revisions

7010. By Jignesh Rathod(OpenERP) on 2012-08-23

[MERGE]: Merge with lp:openobject-addons

7009. By jir <jir@jir-desktop> on 2012-07-10

[FIX] Solve the problem of workordercosting.

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-08-15 20:51:43 +0000
+++ mrp/mrp.py	2012-08-23 06:56:20 +0000
@@ -818,7 +818,7 @@
         for wc_line in production.workcenter_lines:
             wc = wc_line.workcenter_id
             if wc.costs_journal_id and wc.costs_general_account_id:
-                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
@@ -830,7 +830,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.uom_id.id
                     } )
             if wc.costs_journal_id and wc.costs_general_account_id: