diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index db5b73078c5..dc293fee0b9 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -67,116 +67,117 @@
 	-->
 
 	<record id="stock_inventory_line_0" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','PC1')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_pc1"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">14.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Finished products')]"/>
+		<field name="location_id" ref="stock_location_14"/>
 	</record>
+
 	<record id="stock_inventory_line_1" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','KEYA')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_24"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">16.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Finished products')]"/>
+		<field name="location_id" ref="stock_location_14"/>
 	</record>
 	<record model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','MOU')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_25"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">16.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Finished products')]"/>
+		<field name="location_id" ref="stock_location_14"/>
 	</record>
 	<record model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','PC3')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_pc3"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">8.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Finished products')]"/>
+		<field name="location_id" ref="stock_location_14"/>
 	</record>
 	<record id="stock_inventory_line_2" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','MB1')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_mb1"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">8.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_3" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','MB2')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_mb2"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">10.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_4" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','CPU1')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_cpu1"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">6.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_5" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','CPU2')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_cpu3"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">8.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_6" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','HDD1')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_hdd1"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">26.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_7" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','FAN')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_fan"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">32.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_8" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','FAN2')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_fan2"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">37.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_9" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','RAM')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_ram"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">39.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_10" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','RAM512')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_ram512"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">45.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_11" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','HDD2')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_hdd2"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">10.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_12" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','HDD3')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_hdd3"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">2.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	<record id="stock_inventory_line_13" model="stock.inventory.line">
-		<field name="product_id" model="product.product" search="[('default_code','=','TOW1')]"/>
-		<field name="product_uom" model="product.uom" search="[('name','=','Unit')]"/>
+		<field name="product_id" ref="product.product_product_tow1"/>
+		<field name="product_uom" ref="product.product_uom_unit"/>
 		<field name="inventory_id" ref="stock_inventory_0"/>
 		<field name="product_qty">10.0</field>
-		<field name="location_id" model="stock.location" search="[('name','=','Components')]"/>
+		<field name="location_id" ref="stock_location_components"/>
 	</record>
 	
 	<function model="stock.inventory" name="action_done">