diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 5cea2454c74..a061349d78f 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -6,6 +6,11 @@
             <field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
         </record>
 
+        <!-- Resource: res.company -->
+		<record id="stock.res_company_1" model="res.company">
+			<field eval="1.0" name="manufacturing_lead"/>
+		</record>
+
         <record id="account_assembly_hours" model="account.analytic.account">
             <field name="type">normal</field>
             <field name="code">ASML - HOUR</field>
@@ -28,9 +33,7 @@
         </record>
 
 
-        <!--
-    Resource: mrp.workcenter
-    -->
+        <!-- Resource: mrp.workcenter -->
 
         <record id="mrp_workcenter_0" model="mrp.workcenter">
             <field name="name">Assembly workshop</field>
@@ -64,15 +67,66 @@
             <field name="time_cycle">0.75</field>
         </record>
 
-      <!--
-    Resource: res.company
-    -->
-		<record id="stock.res_company_1" model="res.company">
-			<field eval="1.0" name="manufacturing_lead"/>
-		</record>
-        <!--
-    Resource: mrp.property.group
-    -->
+        <!-- Resource: mrp.routing -->
+
+        <record id="mrp_routing_0" model="mrp.routing">
+            <field name="name">Assembly Line 1</field>
+        </record>
+
+        <record id="mrp_routing_1" model="mrp.routing">
+            <field name="name">Custom Assembly Line</field>
+        </record>
+
+        <record id="mrp_routing_2" model="mrp.routing">
+            <field name="name">Manual Component's Assembly</field>
+        </record>
+
+
+        <!-- Resource: mrp.routing.workcenter -->
+
+        <record id="mrp_routing_workcenter_0" model="mrp.routing.workcenter">
+            <field name="routing_id" ref="mrp_routing_0"/>
+            <field name="workcenter_id" ref="mrp_workcenter_0"/>
+            <field name="name">Manual Assembly</field>
+            <field name="hour_nbr">2</field>
+            <field name="sequence">5</field>
+        </record>
+
+        <record id="mrp_routing_workcenter_1" model="mrp.routing.workcenter">
+            <field name="routing_id" ref="mrp_routing_1"/>
+            <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">
+            <field name="routing_id" ref="mrp_routing_1"/>
+            <field name="workcenter_id" ref="mrp_workcenter_0"/>
+            <field name="name">Testing</field>
+            <field name="hour_nbr">1</field>
+            <field name="sequence">10</field>
+        </record>
+
+        <record id="mrp_routing_workcenter_4" model="mrp.routing.workcenter">
+            <field name="routing_id" ref="mrp_routing_1"/>
+            <field name="workcenter_id" ref="mrp_workcenter_1"/>
+            <field name="name">Packing</field>
+            <field name="hour_nbr">0.5</field>
+            <field name="sequence">5</field>
+        </record>
+
+        <record id="mrp_routing_workcenter_2" model="mrp.routing.workcenter">
+            <field name="routing_id" ref="mrp_routing_2"/>
+            <field name="workcenter_id" ref="mrp_workcenter_2"/>
+            <field name="cycle_nbr">0.5</field>
+            <field name="hour_nbr">2</field>
+            <field name="sequence">5</field>
+            <field name="name">Manual Assembly</field>
+        </record>
+
+    <!-- Resource: mrp.property.group -->
 
         <record id="mrp_property_group_ram" model="mrp.property.group">
             <field name="name">RAM</field>
@@ -118,9 +172,7 @@
             <field name="name">PSU</field>
         </record>
 
-        <!--
-    Resource: mrp.property
-    -->
+        <!-- Resource: mrp.property -->
 
         <record id="mrp_property_0" model="mrp.property">
             <field name="group_id" ref="mrp_property_group_ram"/>
@@ -197,74 +249,9 @@
             <field name="name">PSU LC Power LC6550</field>
         </record>
 
-        <!--
-    Resource: mrp.routing
-    -->
+        <!-- Resource: mrp.bom -->
 
-        <record id="mrp_routing_0" model="mrp.routing">
-            <field name="name">Assembly Line 1</field>
-        </record>
-
-        <record id="mrp_routing_1" model="mrp.routing">
-            <field name="name">Custom Assembly Line</field>
-        </record>
-
-        <record id="mrp_routing_2" model="mrp.routing">
-            <field name="name">Manual Component's Assembly</field>
-        </record>
-
-
-        <!--
-    Resource: mrp.routing.workcenter
-    -->
-
-        <record id="mrp_routing_workcenter_0" model="mrp.routing.workcenter">
-            <field name="routing_id" ref="mrp_routing_0"/>
-            <field name="workcenter_id" ref="mrp_workcenter_0"/>
-            <field name="name">Manual Assembly</field>
-            <field name="hour_nbr">2</field>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="mrp_routing_workcenter_1" model="mrp.routing.workcenter">
-            <field name="routing_id" ref="mrp_routing_1"/>
-            <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">
-            <field name="routing_id" ref="mrp_routing_1"/>
-            <field name="workcenter_id" ref="mrp_workcenter_0"/>
-            <field name="name">Testing</field>
-            <field name="hour_nbr">1</field>
-            <field name="sequence">10</field>
-        </record>
-
-        <record id="mrp_routing_workcenter_4" model="mrp.routing.workcenter">
-            <field name="routing_id" ref="mrp_routing_1"/>
-            <field name="workcenter_id" ref="mrp_workcenter_1"/>
-            <field name="name">Packing</field>
-            <field name="hour_nbr">0.5</field>
-            <field name="sequence">5</field>
-        </record>
-
-        <record id="mrp_routing_workcenter_2" model="mrp.routing.workcenter">
-            <field name="routing_id" ref="mrp_routing_2"/>
-            <field name="workcenter_id" ref="mrp_workcenter_2"/>
-            <field name="cycle_nbr">0.5</field>
-            <field name="hour_nbr">2</field>
-            <field name="sequence">5</field>
-            <field name="name">Manual Assembly</field>
-        </record>
-
-        <!--
-    Resource: mrp.bom
-    -->
-
-        <record id="mrp_bom_0" model="mrp.bom">
+        <record id="mrp_bom_12" model="mrp.bom">
             <field name="name">Regular processor config</field>
             <field name="sequence">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -371,7 +358,7 @@
             <field model="product.product" name="product_id" ref="product.product_product_10"/>
         </record>
 
-        <record id="mrp_bom_arm1" model="mrp.bom">
+        <record id="mrp_bom_17" model="mrp.bom">
             <field name="name">ARM100 + Subproduct</field>
             <field name="sequence">40</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -379,7 +366,7 @@
             <field model="product.product" name="product_id" ref="product.product_product_28" />
         </record>
 
-        <record id="mrp_bom_kit3" model="mrp.bom">
+        <record id="mrp_bom_50" model="mrp.bom">
             <field name="code">KIT</field>
             <field name="name">Kit Keyboard + Mouse</field>
             <field name="sequence">42</field>
@@ -417,7 +404,7 @@
             <field model="product.product" name="product_id" ref="product.product_product_19"/>
         </record>
 
-        <record id="mrp_bom_1900" model="mrp.bom">
+        <record id="mrp_bom_14" model="mrp.bom">
             <field name="name">Regular Case Fan</field>
             <field name="sequence">54</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -435,7 +422,7 @@
             <field model="product.product" name="product_id" ref="product.product_product_17"/>
         </record>
 
-        <record id="mrp_bom_1901" model="mrp.bom">
+        <record id="mrp_bom_15" model="mrp.bom">
             <field name="name">DDR 512MB PC400</field>
             <field name="sequence">59</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -580,13 +567,13 @@
             <field model="product.product" name="product_id" ref="product.product_product_12"/>
         </record>
 
-        <record id="mrp_bom_processor" model="mrp.bom">
+        <record id="mrp_bom_53" model="mrp.bom">
             <field name="name">processor</field>
             <field name="sequence">98</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_0"/>
+            <field name="bom_id" ref="mrp_bom_12"/>
             <field model="product.product" name="product_id" ref="product.product_product_9"/>
         </record>
 
@@ -596,31 +583,31 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_0"/>
+            <field name="bom_id" ref="mrp_bom_12"/>
             <field model="product.product" name="product_id" ref="product.product_product_7"/>
         </record>
 
-        <record id="mrp_bom_fan" model="mrp.bom">
+        <record id="mrp_bom_47" model="mrp.bom">
             <field name="name">fan</field>
             <field name="sequence">105</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_0"/>
+            <field name="bom_id" ref="mrp_bom_12"/>
             <field model="product.product" name="product_id" ref="product.product_product_14"/>
         </record>
 
-        <record id="mrp_bom_ram" model="mrp.bom">
+        <record id="mrp_bom_54" model="mrp.bom">
             <field name="name">RAM</field>
             <field name="sequence">108</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_0"/>
+            <field name="bom_id" ref="mrp_bom_12"/>
             <field model="product.product" name="product_id" ref="product.product_product_17"/>
         </record>
 
-        <record id="mrp_bom_kit1" model="mrp.bom">
+        <record id="mrp_bom_48" model="mrp.bom">
             <field name="code">KIT</field>
             <field name="sequence">15</field>
             <field name="name">Kit Keyboard + Mouse</field>
@@ -630,21 +617,21 @@
             <field model="product.product" name="product_id" ref="product.product_product_26"/>
         </record>
 
-        <record id="mrp_bom_mouse2" model="mrp.bom">
+        <record id="mrp_bom_52" model="mrp.bom">
             <field name="name">Mouse</field>
             <field name="sequence">121</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field name="bom_id" ref="mrp_bom_kit1"/>
+            <field name="bom_id" ref="mrp_bom_48"/>
             <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
 
-        <record id="mrp_bom_clavier2" model="mrp.bom">
+        <record id="mrp_bom_40" model="mrp.bom">
             <field name="name">Keyboard</field>
             <field name="sequence">123</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field name="bom_id" ref="mrp_bom_kit1"/>
+            <field name="bom_id" ref="mrp_bom_48"/>
             <field model="product.product" name="product_id" ref="product.product_product_24"/>
         </record>
 
@@ -678,7 +665,7 @@
             <field model="product.product" name="product_id" ref="product.product_product_27"/>
         </record>
 
-        <record id="mrp_bom_kit2" model="mrp.bom">
+        <record id="mrp_bom_49" model="mrp.bom">
             <field name="code">KIT</field>
             <field name="sequence">118</field>
             <field name="name">Kit Keyboard + Mouse</field>
@@ -695,14 +682,12 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
-            <field name="bom_id" ref="mrp_bom_arm1"/>
+            <field name="bom_id" ref="mrp_bom_17"/>
             <field model="product.product" name="product_id" ref="product.product_product_41"/>
         </record>
-        <!--
-    Resource: mrp.bom new EVV
-    -->
+        <!-- Resource: mrp.bom new EVV -->
 
-    <record id="mrp_bom_defaultbomforshelfofcm0" model="mrp.bom">
+    <record id="mrp_bom_45" model="mrp.bom">
         <field name="name">Default BOM for Shelf of 100cm</field>
         <field name="code">SHE100</field>
         <field name="sequence">10</field>
@@ -717,43 +702,42 @@
                 SIDEPAN      2         PCE     normal
                 PROFIL       4         PCE     phantom
                 RPAN100      1         PCE     phantom
-                RCK100       3         PCE     phantom
-    -->
+                RCK100       3         PCE     phantom -->
 
-    <record id="mrp_bom_sidepanel0" model="mrp.bom">
+    <record id="mrp_bom_64" model="mrp.bom">
         <field name="name">Side Panel</field>
         <field name="sequence">101</field>
         <field name="product_id" ref="product.product_product_41"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
         <field name="product_qty">2.0</field>
-        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
+        <field name="bom_id" ref="mrp_bom_45"/>
     </record>
 
-    <record id="mrp_bom_assemblysection0" model="mrp.bom">
+    <record id="mrp_bom_20" model="mrp.bom">
         <field name="name">Assembly Section</field>
         <field name="sequence">102</field>
         <field name="product_id" ref="product.product_product_44"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
         <field name="product_qty">4.0</field>
-        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
+        <field name="bom_id" ref="mrp_bom_45"/>
         <field name="type">phantom</field>
     </record>
 
-    <record id="mrp_bom_rearpanelarm0" model="mrp.bom">
+    <record id="mrp_bom_55" model="mrp.bom">
        <field name="sequence">103</field>
        <field name="product_id" ref="product.product_product_39"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
-       <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
+       <field name="bom_id" ref="mrp_bom_45"/>
        <field name="product_qty">1.0</field>
        <field name="name">Rear panel SHE100</field>
        <field name="type">phantom</field>
     </record>
 
-    <record id="mrp_bom_shelf0" model="mrp.bom">
+    <record id="mrp_bom_60" model="mrp.bom">
        <field name="sequence">104</field>
        <field name="product_id" ref="product.product_product_42"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
-       <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
+       <field name="bom_id" ref="mrp_bom_45"/>
        <field name="product_qty">3.0</field>
        <field name="name">RCK100</field>
        <field name="type">phantom</field>
@@ -763,58 +747,55 @@
         BOMs for 1 RCK100 PCE
                     Product Ref     Qty    UoM  Type of BoM
                     SPAN100         1      PCE  phantom
-                    METC000         4      PCE  normal
-    -->
-    <record id="mrp_bom_shelf1" model="mrp.bom">
+                    METC000         4      PCE  normal -->
+    <record id="mrp_bom_62" model="mrp.bom">
        <field name="sequence">133</field>
        <field name="product_id" ref="product.product_product_42"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="product_qty">1.0</field>
        <field name="name">RCK100</field>
     </record>
-    <record id="mrp_bom_shelf0_span100" model="mrp.bom">
+    <record id="mrp_bom_61" model="mrp.bom">
        <field name="sequence">1331</field>
        <field name="product_id" ref="product.product_product_31"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
-       <field name="bom_id" ref="mrp_bom_shelf1"/>
+       <field name="bom_id" ref="mrp_bom_62"/>
        <field name="product_qty">1.0</field>
        <field name="type">phantom</field> <!-- It should be phantom -->
        <field name="name">SPAN100</field>
     </record>
-    <record id="mrp_bom_shelf0_metalcleats0" model="mrp.bom">
+    <record id="mrp_bom_59" model="mrp.bom">
        <field name="sequence">1332</field>
        <field name="product_id" ref="product.product_product_46"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
-       <field name="bom_id" ref="mrp_bom_shelf1"/>
+       <field name="bom_id" ref="mrp_bom_62"/>
        <field name="product_qty">4.0</field>
        <field name="name">METC000</field>
     </record>
     <!--
     Bill of Materials for 1 SPAN100 PCE
                     Product Code     Quantity     Unit of Measure
-                    WOOD010          0.083        m
-    -->
-    <record id="mrp_bom_span100" model="mrp.bom">
+                    WOOD010          0.083        m -->
+    <record id="mrp_bom_67" model="mrp.bom">
        <field name="sequence">135</field>
        <field name="product_id" ref="product.product_product_31"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="product_qty">1.0</field>
        <field name="name">SPAN100</field>
     </record>
-    <record id="mrp_bom_span100_wood010" model="mrp.bom">
+    <record id="mrp_bom_68" model="mrp.bom">
        <field name="sequence">1351</field>
        <field name="product_id" ref="product.product_product_34"/>
        <field name="product_uom" ref="product.product_uom_meter"/>
-       <field name="bom_id" ref="mrp_bom_span100"/>
+       <field name="bom_id" ref="mrp_bom_67"/>
        <field name="product_qty">0.083</field>
        <field name="name">WOOD010</field>
     </record>
     <!-- BoMs for 1 Assembly Section PCE
             Product Ref.     Qty     UoM
                 LIN40        0.25    Meter
-
-    -->
-    <record id="mrp_bom_assemblysection1" model="mrp.bom">
+ -->
+    <record id="mrp_bom_21" model="mrp.bom">
         <field name="name">Assembly Section</field>
         <field name="sequence">123</field>
         <field name="product_id" ref="product.product_product_44"/>
@@ -824,20 +805,19 @@
 
     </record>
 
-    <record id="mrp_bom_woodlintelm0" model="mrp.bom">
+    <record id="mrp_bom_69" model="mrp.bom">
        <field name="sequence">1231</field>
        <field name="product_id" ref="product.product_product_45"/>
        <field name="product_uom" ref="product.product_uom_meter"/>
        <field name="product_qty">0.25</field>
-       <field name="bom_id" ref="mrp_bom_assemblysection1"/>
+       <field name="bom_id" ref="mrp_bom_21"/>
        <field name="name">Wood Lintel 0.25m</field>
     </record>
     <!--
     Bill of Materials for 1 RPAN100 PCE
                     Product Code     Quantity     Unit of Measure
-                    WOOD002          0.25         m
-    -->
-    <record id="mrp_bom_rearpanelarm1" model="mrp.bom">
+                    WOOD002          0.25         m -->
+    <record id="mrp_bom_56" model="mrp.bom">
        <field name="sequence">131</field>
        <field name="product_id" ref="product.product_product_39"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
@@ -845,17 +825,17 @@
        <field name="name">Rear panel SHE100</field>
         <field name="routing_id" ref="mrp.mrp_routing_0"/>
     </record>
-    <record id="mrp_bom_rearpanelarm1_wood002" model="mrp.bom">
+    <record id="mrp_bom_57" model="mrp.bom">
        <field name="sequence">1311</field>
        <field name="product_id" ref="product.product_product_32"/>
        <field name="product_uom" ref="product.product_uom_meter"/>
-       <field name="bom_id" ref="mrp_bom_rearpanelarm1"/>
+       <field name="bom_id" ref="mrp_bom_56"/>
        <field name="product_qty">0.25</field>
        <field name="name">WOOD002 0.25m</field>
     </record>
 
 
-    <record id="mrp_bom_defaultbomforshelfofcm1" model="mrp.bom">
+    <record id="mrp_bom_46" model="mrp.bom">
         <field name="name">Default BOM for Shelf of 200cm</field>
         <field name="code">SHE200</field>
         <field name="sequence">137</field>
@@ -870,54 +850,53 @@
              PROFIL          4       PCE     normal
              SIDEPAN         2       PCE     normal
              METC000         12      PCE     normal
-             RCK200          3       PCE     normal
-    -->
-    <record id="mrp_bom_rearpanelarm2" model="mrp.bom">
+             RCK200          3       PCE     normal -->
+    <record id="mrp_bom_58" model="mrp.bom">
        <field name="sequence">147</field>
        <field name="product_id" ref="product.product_product_40"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
-       <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
+       <field name="bom_id" ref="mrp_bom_46"/>
        <field name="product_qty">1.0</field>
        <field name="name">Rear panel SHE200</field>
     </record>
 
-    <record id="mrp_bom_assemblysection3" model="mrp.bom">
+    <record id="mrp_bom_39" model="mrp.bom">
         <field name="name">Assembly Section</field>
         <field name="sequence">149</field>
         <field name="product_id" ref="product.product_product_44"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
         <field name="product_qty">4.0</field>
-        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
+        <field name="bom_id" ref="mrp_bom_46"/>
     </record>
 
-    <record id="mrp_bom_sidepanel3" model="mrp.bom">
+    <record id="mrp_bom_66" model="mrp.bom">
         <field name="name">Side Panel</field>
         <field name="sequence">151</field>
         <field name="product_id" ref="product.product_product_41"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
         <field name="product_qty">2.0</field>
-        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
+        <field name="bom_id" ref="mrp_bom_46"/>
     </record>
 
-    <record id="mrp_bom_shelf2" model="mrp.bom">
+    <record id="mrp_bom_63" model="mrp.bom">
        <field name="sequence">153</field>
        <field name="product_id" ref="product.product_product_43"/>
        <field name="product_uom" ref="product.product_uom_unit"/>
-       <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
+       <field name="bom_id" ref="mrp_bom_46"/>
        <field name="product_qty">3.0</field>
        <field name="name">Shelf 200</field>
     </record>
 
-    <record id="mrp_bom_metalcleats3" model="mrp.bom">
+    <record id="mrp_bom_51" model="mrp.bom">
         <field name="name">Metal Cleats</field>
         <field name="sequence">155</field>
         <field name="product_id" ref="product.product_product_46"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
         <field name="product_qty">12.0</field>
-        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
+        <field name="bom_id" ref="mrp_bom_46"/>
     </record>
 
-    <record id="mrp_bom_defaultbomforkitshelfofcm0" model="mrp.bom">
+    <record id="mrp_bom_44" model="mrp.bom">
         <field name="name">Default BOM for KIT Shelf of 100cm</field>
         <field name="code">SHE100KIT</field>
         <field name="sequence">139</field>
@@ -930,25 +909,24 @@
     <!--Defining BoMs of KIT Shelf 100cm
             Product Ref.     Qty     UoM     Type of BoM
                 PROFIL       4       PCE     normal
-                SIDEPAN      2       PCE     normal
-    -->
+                SIDEPAN      2       PCE     normal -->
 
-    <record id="mrp_bom_assemblysection2" model="mrp.bom">
+    <record id="mrp_bom_37" model="mrp.bom">
         <field name="name">Assembly Section</field>
         <field name="sequence">143</field>
         <field name="product_id" ref="product.product_product_44"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
         <field name="product_qty">4.0</field>
-        <field name="bom_id" ref="mrp_bom_defaultbomforkitshelfofcm0"/>
+        <field name="bom_id" ref="mrp_bom_44"/>
     </record>
 
-    <record id="mrp_bom_sidepanel2" model="mrp.bom">
+    <record id="mrp_bom_65" model="mrp.bom">
         <field name="name">Side Panel</field>
         <field name="sequence">145</field>
         <field name="product_id" ref="product.product_product_41"/>
         <field name="product_uom" ref="product.product_uom_unit"/>
         <field name="product_qty">2.0</field>
-        <field name="bom_id" ref="mrp_bom_defaultbomforkitshelfofcm0"/>
+        <field name="bom_id" ref="mrp_bom_44"/>
     </record>
 
 <record id="product.product_uom_dozen" model="product.uom">
@@ -964,7 +942,7 @@
         <field name="product_qty">3</field>
         <field name="location_src_id" ref="stock.stock_location_stock"/>
         <field name="location_dest_id" ref="stock.stock_location_output"/>
-        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
+        <field name="bom_id" ref="mrp_bom_45"/>
     </record>
 
     <record id="mrp_production_order1" model="mrp.production">