diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 3e29930bae2..af574a709cd 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -5,6 +5,32 @@
         <record id="base.user_demo" model="res.users">
             <field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
         </record>
+
+        <record id="account_assembly_hours" model="account.analytic.account">
+            <field name="type">normal</field>
+            <field name="code">ASML - HOUR</field>
+            <field name="name">Costing Account For Hours of Assembly.</field>
+        </record>
+    
+        <record id="account_assembly_cycle" model="account.analytic.account">
+            <field name="type">normal</field>
+            <field name="code">ASML - Cycle</field>
+            <field name="name">Costing Account For Cycle of Assembly.</field>
+        </record>
+
+        <record id="product.product_category_assembly" model="product.category">
+            <field name="parent_id" ref="product.product_category_services"/>
+            <field name="name">Assembly Service</field>
+        </record>
+
+        <record id="product.product_assembly" model="product.product">
+            <field name="standard_price">0.1</field>
+            <field name="uom_id" ref="product.uom_hour"/>
+            <field name="uom_po_id" ref="product.uom_hour"/>
+            <field name="type">service</field>
+            <field name="name">Assembly Service Cost</field>
+            <field name="categ_id" ref="product.product_category_assembly"/>
+        </record>
         
         
         <!--
@@ -14,10 +40,23 @@
         <record id="mrp_workcenter_0" model="mrp.workcenter">
             <field name="name">Assembly workshop</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="capacity_per_cycle">5</field>
+            <field name="time_cycle">1</field>
+            <field name="time_start">0.1</field>
+            <field name="time_stop">0.1</field>
+            <field name="time_efficiency">0.87</field>
+            <field name="product_id" ref="product.product_assembly"/>
+            <field name="costs_hour">0.1</field>
+            <field name="costs_hour_account_id" ref="account_assembly_hours"/>
+            <field name="costs_cycle">0.05</field>
+            <field name="costs_cycle_account_id" ref="account_assembly_cycle"/>
+            <field name="costs_journal_id" ref="account.expenses_journal"/>
+            <field name="costs_general_account_id" ref="account.a_expense"/>
         </record>
         <record id="mrp_workcenter_1" model="mrp.workcenter">
             <field name="name">Repairs workshop</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="time_cycle">1</field>
         </record>
       <!--
     Resource: res.company
@@ -158,6 +197,7 @@
             <field name="workcenter_id" ref="mrp_workcenter_0"/>
             <field name="name">long time assembly</field>
             <field name="hour_nbr">5</field>
+            <field name="cycle_nbr">2</field>
             <field name="sequence">15</field>
         </record>
         <record id="mrp_routing_workcenter_3" model="mrp.routing.workcenter">
diff --git a/addons/mrp/test/order_demo.yml b/addons/mrp/test/order_demo.yml
index 8c2b6a00115..9c7b8720904 100644
--- a/addons/mrp/test/order_demo.yml
+++ b/addons/mrp/test/order_demo.yml
@@ -20,4 +20,8 @@
     routing_id: mrp.mrp_routing_1
     product_uom: product.product_uom_dozen
     product_qty: 5.0
+-
+  !record {model: mrp.workcenter, id: mrp_workcenter_0}:
+    product_id: product.product_assembly
+
 
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index f4c09438322..c9e134db3fc 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -75,26 +75,31 @@
     routing = order.routing_id
     assert len(order.workcenter_lines), "Workcenter lines are not generated proper."
     for line in order.workcenter_lines:
+        wc = line.workcenter_id
+        hours = ((wc.time_start or 0.0)+(wc.time_stop or 0.0)+line.cycle*(wc.time_cycle or 0.0)) * (wc.time_efficiency or 1.0)
+        factor = 5*12
+        d, m = divmod(factor, wc.capacity_per_cycle)
+        cycle = (d + (m and 1.0 or 0.0))
         if line.name == "Short time assembly - Assembly Section":
             assert line.sequence, "Sequence is not correspond: %s" % (line.name)
-            assert line.cycle == (4*5*12), "Cycle is not correspond: %s" % (line.name)
-            assert line.hour == (2*4*5*12), "Hours is not correspond: %s"% (line.name)
+            assert line.cycle == (4*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (2*cycle*4 + hours), "Hours is not correspond: %s"% (line.name)
         elif line.name == "Short time assembly - Rear Panel SHE100":
             assert line.sequence, "Sequence is not correspond: %s" % (line.name)
-            assert line.cycle == (1*5*12), "Cycle is not correspond: %s" % (line.name)
-            assert line.hour == (2*1*5*12), "Hours is not correspond: %s"% (line.name)
+            assert line.cycle == (1*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (2*cycle + hours), "Hours is not correspond: %s"% (line.name)
         elif line.name == "long time assembly - Shelf of 100cm":
             assert line.sequence, "Sequence is not correspond: %s" % (line.name)
-            assert line.cycle == (1*5*12), "Cycle is not correspond: %s" % (line.name)
-            assert line.hour == (5*1*5*12), "Hours is not correspond: %s"% (line.name)
+            assert line.cycle == (2*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (5*cycle + hours), "Hours is not correspond: %s"% (line.name)
         elif line.name == "Testing - Shelf of 100cm":
             assert line.sequence, "Sequence is not correspond: %s" % (line.name)
-            assert line.cycle == (1*5*12), "Cycle is not correspond: %s" % (line.name)
-            assert line.hour == (1*1*5*12), "Hours is not correspond: %s"% (line.name)
+            assert line.cycle == (1*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (1*cycle + hours), "Hours is not correspond: %s"% (line.name)
         elif line.name == "Packing - Shelf of 100cm":
             assert line.sequence, "Sequence is not correspond: %s" % (line.name)
-            assert line.cycle == (1*5*12), "Cycle is not correspond: %s" % (line.name)
-            assert line.hour == (0.5*1*5*12), "Hours is not correspond: %s"% (line.name)
+            assert line.cycle == (1*cycle), "Cycle is not correspond: %s" % (line.name)
+            assert line.hour == (0.5*cycle + hours), "Hours is not correspond: %s"% (line.name)
         else:
             raise AssertionError('unknown workcenter line: %s' % line)
 -
@@ -239,7 +244,40 @@
   !python {model: mrp.production}: |
     order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
     assert order.state == 'done', "Production order should be closed."
+- 
+  I check Total Costs at End of Production. 
+-
+  !python {model: mrp.production}: |
+    order = self.browse(cr, uid, ref("mrp_production_shelf100cm"))
+    account_analytic_line = self.pool.get('account.analytic.line')
+    def rounding(f, r):
+        import math
+        if not r:
+            return f
+        return math.ceil(f / r) * r
 
+    for wc_line in order.workcenter_lines:
+        wc = wc_line.workcenter_id
+        accounts = [wc.costs_hour_account_id, wc.costs_cycle_account_id]
+        cost_per_cyle = wc_line.cycle * wc.costs_cycle
+        cost_per_hours = wc_line.hour * wc.costs_hour
+        if accounts and wc.costs_journal_id and wc.costs_general_account_id and (cost_per_cyle or cost_per_hours):
+            line_ids = account_analytic_line.search(cr, uid, [('name','ilike',wc_line.name)])
+            assert line_ids, 'Costs lines are not generated.'
+            for line in account_analytic_line.browse(cr, uid, line_ids, context=context):
+                if wc.costs_hour_account_id and line.account_id.id == wc.costs_hour_account_id.id:
+                    assert rounding(line.unit_amount, 3) == rounding(wc_line.hour, 3), "Cost Unit Amount is not correspond."
+                    assert rounding(line.amount, 3) == rounding(cost_per_hours, 3), "Cost amount is not correspond."
+                elif wc.costs_cycle_account_id and line.account_id.id == wc.costs_cycle_account_id.id:
+                    assert rounding(line.unit_amount, 3) == rounding(wc_line.cycle, 3), "Cost Unit Amount is not correspond."
+                    assert rounding(line.amount, 3) == rounding(cost_per_cyle, 3), "Cost Amount is not correspond."
+                else:
+                    raise AssertionError('unknown cost line: %s' % line)
+                assert line.general_account_id.id == wc.costs_general_account_id.id, "General Account is not correspond."
+                assert line.journal_id.id == wc.costs_journal_id.id, "Account Journal is not correspond."
+                assert line.product_id.id == wc.product_id.id, "Product is not correspond."
+                assert line.product_uom_id.id == wc.product_id.uom_id.id, "UOM is not correspond."
+            
 -
   I print a "BOM Structure".
 -