[FIX] mrp: fixed demo data when default_code is overridded in a custom module

bzr revid: olt@tinyerp.com-20100217121807-48391nectwvs1w0f

diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index dba0633..ed7dadf 100644 (file)
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -169,7 +169,7 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="type">normal</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         
         <record id="mrp_bom_1" model="mrp.bom">
@@ -177,54 +177,54 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc2" />
         </record>
         <record id="mrp_bom_2" model="mrp.bom">
             <field name="name">Assembly Medium PC</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC3')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc3"/>
         </record>
         <record id="mrp_bom_3" model="mrp.bom">
             <field name="name">Assembly Customizable PC</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC4')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc4"/>
         </record>
         <record id="mrp_bom_4" model="mrp.bom">
             <field name="name">HDD on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_5" model="mrp.bom">
             <field name="name">RAM on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_21"/>
         </record>
         <record id="mrp_bom_6" model="mrp.bom">
             <field name="name">HDD on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_7" model="mrp.bom">
             <field name="name">HDD on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_8" model="mrp.bom">
             <field name="name">HDD Seagate</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_9" model="mrp.bom">
             <field name="name">Assembly Basic PC</field>
@@ -232,29 +232,29 @@
             <field name="product_qty">1.0</field>
             <field name="routing_id" ref="mrp_routing_0"/>
             <field name="type">normal</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
         </record>
         <record id="mrp_bom_10" model="mrp.bom">
             <field name="name">Complete PC with peripherals</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC0')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_23"/>
         </record>
         <record id="mrp_bom_11" model="mrp.bom">
             <field name="name">RAM on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="type">phantom</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_23"/>
         </record>
-        
+
         <record id="mrp_bom_13" model="mrp.bom">
             <field name="name">High Speed Processor + main board on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu3"/>
         </record>
-        
+
         <record id="mrp_bom_kit" model="mrp.bom">
             <field name="code">KIT</field>
             <field name="name">Kit Mouse</field>
@@ -262,77 +262,77 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
         <record id="mrp_bom_clavier" model="mrp.bom">
             <field name="name">Keyboard</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','KEYA')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_24"/>
         </record>
         <record id="mrp_bom_mouse" model="mrp.bom">
             <field name="name">Mouse</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
         <record id="mrp_bom_16" model="mrp.bom">
             <field name="name">Moon PC</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_10"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
         </record>
         <record id="mrp_bom_18" model="mrp.bom">
             <field name="name">Mainboard ASUStek A7N8X</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MB2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_mb2"/>
         </record>
         <record id="mrp_bom_19" model="mrp.bom">
             <field name="name">Processor AMD Athlon 2200+</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu2"/>
         </record>
         <record id="mrp_bom_1900" model="mrp.bom">
             <field name="name">Regular Case Fan</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_fan"/>
         </record>
         <record id="mrp_bom_23" model="mrp.bom">
             <field name="name">DDR 256MB PC333</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_11"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram"/>
         </record>
         <record id="mrp_bom_1901" model="mrp.bom">
             <field name="name">DDR 512MB PC400</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_13"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM512')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram512"/>
         </record>
         <record id="mrp_bom_22" model="mrp.bom">
             <field name="name">DDR 1024MB PC400</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_5"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM512')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram512"/>
         </record>
         <record id="mrp_bom_24" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_7"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD3')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd3"/>
         </record>
         <record id="mrp_bom_25" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -340,21 +340,21 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_4"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_26" model="mrp.bom">
             <field name="name">RAM on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_21"/>
         </record>
         <record id="mrp_bom_27" model="mrp.bom">
             <field name="name">HDD on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_20"/>
         </record>
         <record id="mrp_bom_28" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
@@ -362,7 +362,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
         <record id="mrp_bom_29" model="mrp.bom">
             <field name="name">Processor on demand</field>
@@ -370,7 +370,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_3"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         <record id="mrp_bom_30" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
@@ -378,7 +378,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
         <record id="mrp_bom_31" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -386,7 +386,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_32" model="mrp.bom">
             <field name="name">High speed processor config</field>
@@ -394,7 +394,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu2"/>
         </record>
         <record id="mrp_bom_33" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -402,7 +402,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_6"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd2"/>
         </record>
         <record id="mrp_bom_34" model="mrp.bom">
             <field name="name">Regular processor config</field>
@@ -410,7 +410,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         <record id="mrp_bom_35" model="mrp.bom">
             <field name="name">ATX middle-size case</field>
@@ -418,7 +418,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
         <record id="mrp_bom_36" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 120GB</field>
@@ -426,7 +426,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_1"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD2')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd2"/>
         </record>
         <record id="mrp_bom_processor" model="mrp.bom">
             <field name="name">processor</field>
@@ -434,7 +434,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
         </record>
         <record id="mrp_bom_38" model="mrp.bom">
             <field name="name">mainboard</field>
@@ -442,7 +442,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MB1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_mb1"/>
         </record>
         <record id="mrp_bom_fan" model="mrp.bom">
             <field name="name">fan</field>
@@ -450,7 +450,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_fan"/>
         </record>
         <record id="mrp_bom_ram" model="mrp.bom">
             <field name="name">RAM</field>
@@ -458,7 +458,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_0"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','RAM')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_ram"/>
         </record>
         <record id="mrp_bom_41" model="mrp.bom">
             <field name="name">Regular processor config</field>
@@ -466,7 +466,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu_gen"/>
         </record>
         <record id="mrp_bom_42" model="mrp.bom">
             <field name="name">HDD Seagate 7200.8 80GB</field>
@@ -474,7 +474,7 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
         </record>
         <record id="mrp_bom_43" model="mrp.bom">
             <field name="name">ATX Middle-size case</field>
@@ -482,9 +482,9 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
         </record>
-        
+
         <record id="mrp_bom_kit2" model="mrp.bom">
             <field name="code">KIT</field>
             <field name="name">Kit Keyboard + Mouse</field>
@@ -492,21 +492,21 @@
             <field name="product_qty">1.0</field>
             <field name="type">normal</field>
             <field name="bom_id" ref="mrp_bom_9"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','KIT0')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_26"/>
         </record>
         <record id="mrp_bom_mouse2" model="mrp.bom">
             <field name="name">Mouse</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MOU')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_25"/>
         </record>
         <record id="mrp_bom_clavier2" model="mrp.bom">
             <field name="name">Keyboard</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field name="bom_id" ref="mrp_bom_kit2"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','KEYA')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_24"/>
         </record>
         
     </data>

diff --git a/addons/mrp/mrp_order_point.xml b/addons/mrp/mrp_order_point.xml
index ba2e56e..4330782 100644 (file)
--- a/addons/mrp/mrp_order_point.xml
+++ b/addons/mrp/mrp_order_point.xml
@@ -9,7 +9,7 @@
             <field name="product_min_qty">5.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','MB1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_mb1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint">
@@ -17,7 +17,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','CPU1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint">
@@ -25,7 +25,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','HDD1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_hdd1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint">
@@ -33,7 +33,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','FAN')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_fan"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint">
@@ -41,7 +41,7 @@
             <field name="product_min_qty">3.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','PC1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_pc1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint">
@@ -49,7 +49,7 @@
             <field name="product_min_qty">10.0</field>
             <field model="product.uom" name="product_uom" search="[]"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
+            <field model="product.product" name="product_id" ref="product.product_product_tow1"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
     </data>