diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 260b4b3ea0b..39be1635d1a 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -209,7 +209,8 @@
             <field name="categ_id" ref="product.product_category_5"/>
         </record>
 
-        <record id="product_product_1" model="product.product">
+
+        <record id="product_template_1" model="product.template">
             <field name="name">On Site Monitoring</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="public_categ_id" ref="services"/>
@@ -221,8 +222,12 @@
             <field name="description">This type of service include basic monitoring of products.</field>
             <field name="description_sale">This type of service include basic monitoring of products.</field>
         </record>
+        <record id="product_product_1" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_1"/>
+        </record>
 
-        <record id="product_product_2" model="product.product">
+
+        <record id="product_template_2" model="product.template">
             <field name="name">On Site Assistance</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="public_categ_id" ref="services"/>
@@ -233,10 +238,13 @@
             <field name="uom_po_id" ref="product_uom_hour"/>
             <field name="description">This type of service include assistance for security questions, system configuration requirements, implementation or special needs.</field>
         </record>
+        <record id="product_product_2" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_2"/>
+        </record>
 
-        <record id="product_product_3" model="product.product">
+
+        <record id="product_template_3" model="product.template">
             <field name="name">PC Assemble SC234</field>
-            <field name="default_code">PCSC234</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="public_categ_id" ref="Computer_all_in_one"/>
             <field name="list_price">450.0</field>
@@ -249,10 +257,14 @@ Processor AMD 8-Core
 512MB RAM
 HDD SH-1</field>
         </record>
+        <record id="product_product_3" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_3"/>
+            <field name="default_code">PCSC234</field>
+        </record>
 
-        <record id="product_product_4" model="product.product">
+
+        <record id="product_template_4" model="product.template">
             <field name="name">iPad Retina Display</field>
-            <field name="default_code">A2323</field>
             <field name="categ_id" ref="ipad"/>
             <field name="public_categ_id" ref="Computer_all_in_one"/>
             <field name="standard_price">500.0</field>
@@ -264,10 +276,14 @@ HDD SH-1</field>
 Dual-core A5 with quad-core graphics
 FaceTime HD Camera, 1.2 MP Photos</field>
         </record>
+        <record id="product_product_4" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_4"/>
+            <field name="default_code">A2323</field>
+        </record>
 
-        <record id="product_product_5" model="product.product">
+
+        <record id="product_template_5" model="product.template">
             <field name="name">Bose Mini Bluetooth Speaker</field>
-            <field name="default_code">B3423</field>
             <field name="categ_id" ref="accessories"/>
             <field name="public_categ_id" ref="Speakers"/>
             <field name="standard_price">600.0</field>
@@ -278,10 +294,14 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="description">Custom computer assembled on order based on customer's requirement.</field>
             <field name="description_sale">Bose's smallest portable Bluetooth speaker</field>
         </record>
+        <record id="product_product_5" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_5"/>
+            <field name="default_code">B3423</field>
+        </record>
 
-        <record id="product_product_6" model="product.product">
+
+        <record id="product_template_6" model="product.template">
             <field name="name">iPad Mini</field>
-            <field name="default_code">A1232</field>
             <field name="categ_id" ref="ipad"/>
             <field name="public_categ_id" ref="Screen"/>
             <field name="standard_price">800.0</field>
@@ -290,9 +310,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_7" model="product.product">
+        <record id="product_product_6" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_6"/>
+            <field name="default_code">A1232</field>
+        </record>
+
+        <record id="product_template_7" model="product.template">
             <field name="name">Apple In-Ear Headphones</field>
-            <field name="default_code">A8767</field>
             <field name="categ_id" ref="accessories"/>
             <field name="public_categ_id" ref="Screen"/>
             <field name="standard_price">70.0</field>
@@ -301,9 +325,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_8" model="product.product">
+        <record id="product_product_7" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_7"/>
+            <field name="default_code">A8767</field>
+        </record>
+
+        <record id="product_template_8" model="product.template">
             <field name="name">iMac</field>
-            <field name="default_code">A1090</field>
             <field name="categ_id" ref="imac"/>
             <field name="standard_price">1299.0</field>
             <field name="list_price">1799.0</field>
@@ -311,9 +339,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_9" model="product.product">
+        <record id="product_product_8" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_8"/>
+            <field name="default_code">A1090</field>
+        </record>
+
+        <record id="product_template_9" model="product.template">
             <field name="name">Apple Wireless Keyboard</field>
-            <field name="default_code">AK789</field>
             <field name="categ_id" ref="accessories"/>
             <field name="public_categ_id" ref="Keyboard_Mouse"/>
             <field name="standard_price">10.0</field>
@@ -322,9 +354,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_10" model="product.product">
+        <record id="product_product_9" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_9"/>
+            <field name="default_code">AK789</field>
+        </record>
+
+        <record id="product_template_10" model="product.template">
             <field name="name">Mouse, Optical</field>
-            <field name="default_code">M-Opt</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="Keyboard_Mouse"/>
             <field name="standard_price">12.50</field>
@@ -333,10 +369,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_10" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_10"/>
+            <field name="default_code">M-Opt</field>
+        </record>
 
-        <record id="product_product_11_temp" model="product.template">
+        <record id="product_template_11" model="product.template">
             <field name="name">iPod</field>
-            <field name="default_code">A6678</field>
             <field name="categ_id" ref="ipod"/>
             <field name="public_categ_id" ref="Keyboard_Mouse"/>
             <field name="standard_price">14</field>
@@ -356,17 +395,17 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="product_tmpl_id" ref="product_product_11_temp"/>
+            <field name="product_tmpl_id" ref="product_template_11"/>
+            <field name="default_code">A6678</field>
         </record>
         <record id="product_product_11_b" model="product.product">
             <field name="variants">32 Gb</field>
             <field name="price_extra">12</field>
-            <field name="product_tmpl_id" ref="product_product_11_temp"/>
+            <field name="product_tmpl_id" ref="product_template_11"/>
         </record>
 
-        <record id="product_product_12" model="product.product">
+        <record id="product_template_12" model="product.template">
             <field name="name">Mouse, Wireless</field>
-            <field name="default_code">M-Wir</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="Keyboard_Mouse"/>
             <field name="standard_price">18</field>
@@ -375,9 +414,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_13" model="product.product">
+        <record id="product_product_12" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_12"/>
+            <field name="default_code">M-Wir</field>
+        </record>
+
+        <record id="product_template_13" model="product.template">
             <field name="name">RAM SR5</field>
-            <field name="default_code">RAM-SR5</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="Memory"/>
             <field name="standard_price">78.0</field>
@@ -386,9 +429,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_14" model="product.product">
+        <record id="product_product_13" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_13"/>
+            <field name="default_code">RAM-SR5</field>
+        </record>
+
+        <record id="product_template_14" model="product.template">
             <field name="name">RAM SR2</field>
-            <field name="default_code">RAM-SR2</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="Memory"/>
             <field name="standard_price">87.0</field>
@@ -397,9 +444,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_15" model="product.product">
+        <record id="product_product_14" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_14"/>
+            <field name="default_code">RAM-SR2</field>
+        </record>
+
+        <record id="product_template_15" model="product.template">
             <field name="name">RAM SR3</field>
-            <field name="default_code">RAM-SR3</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="Memory"/>
             <field name="standard_price">80.0</field>
@@ -408,9 +459,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_16" model="product.product">
+        <record id="product_product_15" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_15"/>
+            <field name="default_code">RAM-SR3</field>
+        </record>
+
+        <record id="product_template_16" model="product.template">
             <field name="name">Computer Case</field>
-            <field name="default_code">C-Case</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="case"/>
             <field name="standard_price">20.0</field>
@@ -419,9 +474,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_17" model="product.product">
+        <record id="product_product_16" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_16"/>
+            <field name="default_code">C-Case</field>
+        </record>
+
+        <record id="product_template_17" model="product.template">
             <field name="name">HDD SH-1</field>
-            <field name="default_code">HDD-SH1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="HDD"/>
             <field name="standard_price">860.0</field>
@@ -430,9 +489,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_18" model="product.product">
+        <record id="product_product_17" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_17"/>
+            <field name="default_code">HDD-SH1</field>
+        </record>
+
+        <record id="product_template_18" model="product.template">
             <field name="name">HDD SH-2</field>
-            <field name="default_code">HDD-SH2</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="HDD"/>
             <field name="standard_price">1020.0</field>
@@ -441,9 +504,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_19" model="product.product">
+        <record id="product_product_18" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_18"/>
+            <field name="default_code">HDD-SH2</field>
+        </record>
+
+        <record id="product_template_19" model="product.template">
             <field name="name">HDD on Demand</field>
-            <field name="default_code">HDD-DEM</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="HDD"/>
             <field name="standard_price">1100.0</field>
@@ -453,9 +520,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">On demand hard-disk having capacity based on requirement.</field>
         </record>
-        <record id="product_product_20" model="product.product">
+        <record id="product_product_19" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_19"/>
+            <field name="default_code">HDD-DEM</field>
+        </record>
+
+        <record id="product_template_20" model="product.template">
             <field name="name">Motherboard I9P57</field>
-            <field name="default_code">MBi9</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="motherboard"/>
             <field name="standard_price">1700.0</field>
@@ -464,9 +535,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_21" model="product.product">
+        <record id="product_product_20" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_20"/>
+            <field name="default_code">MBi9</field>
+        </record>
+
+        <record id="product_template_21" model="product.template">
             <field name="name">Motherboard A20Z7</field>
-            <field name="default_code">MBa20</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="motherboard"/>
             <field name="standard_price">1790.0</field>
@@ -475,9 +550,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_22" model="product.product">
+        <record id="product_product_21" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_21"/>
+            <field name="default_code">MBa20</field>
+        </record>
+
+        <record id="product_template_22" model="product.template">
             <field name="name">Processor Core i5 2.70 Ghz</field>
-            <field name="default_code">CPUi5</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="processor"/>
             <field name="standard_price">2010.0</field>
@@ -486,9 +565,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_23" model="product.product">
+        <record id="product_product_22" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_22"/>
+            <field name="default_code">CPUi5</field>
+        </record>
+
+        <record id="product_template_23" model="product.template">
             <field name="name">Processor AMD 8-Core</field>
-            <field name="default_code">CPUa8</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="processor"/>
             <field name="standard_price">1910.0</field>
@@ -497,9 +580,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_24" model="product.product">
+        <record id="product_product_23" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_23"/>
+            <field name="default_code">CPUa8</field>
+        </record>
+
+        <record id="product_template_24" model="product.template">
             <field name="name">Graphics Card</field>
-            <field name="default_code">CARD</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="public_categ_id" ref="graphics_card"/>
             <field name="standard_price">876.0</field>
@@ -508,9 +595,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_25" model="product.product">
+        <record id="product_product_24" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_24"/>
+            <field name="default_code">CARD</field>
+        </record>
+
+        <record id="product_template_25" model="product.template">
             <field name="name">Laptop E5023</field>
-            <field name="default_code">LAP-E5</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="public_categ_id" ref="laptops"/>
             <field name="standard_price">2870.0</field>
@@ -523,9 +614,13 @@ FaceTime HD Camera, 1.2 MP Photos</field>
 Standard-1294P Processor
 QWERTY keyboard</field>
         </record>
-        <record id="product_product_26" model="product.product">
+        <record id="product_product_25" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_25"/>
+            <field name="default_code">LAP-E5</field>
+        </record>
+
+        <record id="product_template_26" model="product.template">
             <field name="name">Laptop S3450</field>
-            <field name="default_code">LAP-S3</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="public_categ_id" ref="laptops"/>
             <field name="standard_price">3000.0</field>
@@ -538,9 +633,13 @@ QWERTY keyboard</field>
 Hi-Speed 234Q Processor
 QWERTY keyboard</field>
         </record>
-        <record id="product_product_27" model="product.product">
+        <record id="product_product_26" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_26"/>
+            <field name="default_code">LAP-S3</field>
+        </record>
+
+        <record id="product_template_27" model="product.template">
             <field name="name">Laptop Customized</field>
-            <field name="default_code">LAP-CUS</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="public_categ_id" ref="laptops"/>
             <field name="standard_price">3300.0</field>
@@ -550,9 +649,13 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Custom Laptop based on customer's requirement.</field>
         </record>
-        <record id="product_product_28" model="product.product">
+        <record id="product_product_27" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_27"/>
+            <field name="default_code">LAP-CUS</field>
+        </record>
+
+        <record id="product_template_28" model="product.template">
             <field name="name">External Hard disk</field>
-            <field name="default_code">EXT-HDD</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="public_categ_id" ref="External_Hard_Drive"/>
             <field name="standard_price">390.0</field>
@@ -561,10 +664,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_28" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_28"/>
+            <field name="default_code">EXT-HDD</field>
+        </record>
 
-        <record id="product_product_29" model="product.product">
+
+        <record id="product_template_29" model="product.template">
             <field name="name">Pen drive, SP-2</field>
-            <field name="default_code">PD-SP2</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="public_categ_id" ref="Pen_Drive"/>
             <field name="standard_price">90.0</field>
@@ -573,10 +680,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_29" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_29"/>
+            <field name="default_code">PD-SP2</field>
+        </record>
 
-        <record id="product_product_30" model="product.product">
+
+        <record id="product_template_30" model="product.template">
             <field name="name">Pen drive, SP-4</field>
-            <field name="default_code">PD-SP4</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="public_categ_id" ref="Pen_Drive"/>
             <field name="standard_price">126.0</field>
@@ -585,9 +696,13 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
-        <record id="product_product_31" model="product.product">
+        <record id="product_product_30" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_30"/>
+            <field name="default_code">PD-SP4</field>
+        </record>
+
+        <record id="product_template_31" model="product.template">
             <field name="name">Multimedia Speakers</field>
-            <field name="default_code">MM-SPK</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="public_categ_id" ref="Speakers"/>
             <field name="standard_price">134.0</field>
@@ -597,9 +712,13 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">.</field>
         </record>
-        <record id="product_product_32" model="product.product">
+        <record id="product_product_31" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_31"/>
+            <field name="default_code">MM-SPK</field>
+        </record>
+
+        <record id="product_template_32" model="product.template">
             <field name="name">Headset standard</field>
-            <field name="default_code">HEAD</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="public_categ_id" ref="Headset"/>
             <field name="standard_price">57.0</field>
@@ -609,9 +728,13 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Hands free headset for laptop PC with in-line microphone and headphone plug.</field>
         </record>
-        <record id="product_product_33" model="product.product">
+        <record id="product_product_32" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_32"/>
+            <field name="default_code">HEAD</field>
+        </record>
+
+        <record id="product_template_33" model="product.template">
             <field name="name">Headset USB</field>
-            <field name="default_code">HEAD-USB</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="public_categ_id" ref="Headset"/>
             <field name="standard_price">60.0</field>
@@ -621,10 +744,14 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Headset for laptop PC with USB connector.</field>
         </record>
+        <record id="product_product_33" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_33"/>
+            <field name="default_code">HEAD-USB</field>
+        </record>
 
-        <record id="product_product_34" model="product.product">
+
+        <record id="product_template_34" model="product.template">
             <field name="name">Webcam</field>
-            <field name="default_code">WCAM</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="public_categ_id" ref="video_acquisition"/>
             <field name="standard_price">38.0</field>
@@ -633,10 +760,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_34" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_34"/>
+            <field name="default_code">WCAM</field>
+        </record>
 
-        <record id="product_product_35" model="product.product">
+
+        <record id="product_template_35" model="product.template">
             <field name="name">Blank CD</field>
-            <field name="default_code">CD</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">18.40</field>
             <field name="list_price">20.0</field>
@@ -644,10 +775,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_dozen"/>
             <field name="uom_po_id" ref="product_uom_dozen"/>
         </record>
+        <record id="product_product_35" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_35"/>
+            <field name="default_code">CD</field>
+        </record>
 
-        <record id="product_product_36" model="product.product">
+
+        <record id="product_template_36" model="product.template">
             <field name="name">Blank DVD-RW</field>
-            <field name="default_code">DVD</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">21.60</field>
             <field name="list_price">24.0</field>
@@ -655,10 +790,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_dozen"/>
             <field name="uom_po_id" ref="product_uom_dozen"/>
         </record>
+        <record id="product_product_36" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_36"/>
+            <field name="default_code">DVD</field>
+        </record>
 
-        <record id="product_product_37" model="product.product">
+
+        <record id="product_template_37" model="product.template">
             <field name="name">Printer, All-in-one</field>
-            <field name="default_code">PRINT</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="public_categ_id" ref="printer"/>
             <field name="standard_price">4258.0</field>
@@ -668,10 +807,14 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">All in one hi-speed printer with fax and scanner.</field>
         </record>
+        <record id="product_product_37" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_37"/>
+            <field name="default_code">PRINT</field>
+        </record>
 
-        <record id="product_product_38" model="product.product">
+
+        <record id="product_template_38" model="product.template">
             <field name="name">Ink Cartridge</field>
-            <field name="default_code">INK</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="public_categ_id" ref="printer"/>
             <field name="standard_price">60.0</field>
@@ -680,10 +823,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_38" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_38"/>
+            <field name="default_code">INK</field>
+        </record>
 
-        <record id="product_product_39" model="product.product">
+
+        <record id="product_template_39" model="product.template">
             <field name="name">Toner Cartridge</field>
-            <field name="default_code">TONER</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="public_categ_id" ref="printer"/>
             <field name="standard_price">66.0</field>
@@ -692,10 +839,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_39" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_39"/>
+            <field name="default_code">TONER</field>
+        </record>
 
-        <record id="product_product_40" model="product.product">
+
+        <record id="product_template_40" model="product.template">
             <field name="name">Windows 7 Professional</field>
-            <field name="default_code">Win7</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="public_categ_id" ref="Softwares"/>
             <field name="standard_price">330.0</field>
@@ -704,10 +855,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_40" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_40"/>
+            <field name="default_code">Win7</field>
+        </record>
 
-        <record id="product_product_41" model="product.product">
+
+        <record id="product_template_41" model="product.template">
             <field name="name">Windows Home Server 2011</field>
-            <field name="default_code">WServer</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="public_categ_id" ref="Softwares"/>
             <field name="standard_price">540.0</field>
@@ -716,10 +871,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_41" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_41"/>
+            <field name="default_code">WServer</field>
+        </record>
 
-        <record id="product_product_42" model="product.product">
+
+        <record id="product_template_42" model="product.template">
             <field name="name">Office Suite</field>
-            <field name="default_code">OSuite</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="public_categ_id" ref="Softwares"/>
             <field name="standard_price">110.0</field>
@@ -729,10 +888,14 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description_sale">Office Editing Software with word processing, spreadsheets, presentations, graphics, and databases...</field>
         </record>
+        <record id="product_product_42" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_42"/>
+            <field name="default_code">OSuite</field>
+        </record>
 
-        <record id="product_product_43" model="product.product">
+
+        <record id="product_template_43" model="product.template">
             <field name="name">Zed+ Antivirus</field>
-            <field name="default_code">Zplus</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="public_categ_id" ref="Softwares"/>
             <field name="standard_price">235.0</field>
@@ -741,10 +904,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_43" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_43"/>
+            <field name="default_code">Zplus</field>
+        </record>
 
-        <record id="product_product_44" model="product.product">
+
+        <record id="product_template_44" model="product.template">
             <field name="name">GrapWorks Software</field>
-            <field name="default_code">GRAPs/w</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="public_categ_id" ref="Softwares"/>
             <field name="standard_price">155.0</field>
@@ -754,10 +921,14 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description_sale">Full featured image editing software.</field>
         </record>
+        <record id="product_product_44" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_44"/>
+            <field name="default_code">GRAPs/w</field>
+        </record>
 
-        <record id="product_product_45" model="product.product">
+
+        <record id="product_template_45" model="product.template">
             <field name="name">Router R430</field>
-            <field name="default_code">ROUT_430</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="public_categ_id" ref="Modem_Router"/>
             <field name="standard_price">55.0</field>
@@ -766,10 +937,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_45" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_45"/>
+            <field name="default_code">ROUT_430</field>
+        </record>
 
-        <record id="product_product_46" model="product.product">
+
+        <record id="product_template_46" model="product.template">
             <field name="name">Datacard</field>
-            <field name="default_code">DC</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="public_categ_id" ref="Pen_Drive"/>
             <field name="standard_price">35.0</field>
@@ -778,10 +953,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_46" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_46"/>
+            <field name="default_code">DC</field>
+        </record>
 
-        <record id="product_product_47" model="product.product">
+
+        <record id="product_template_47" model="product.template">
             <field name="name">Switch, 24 ports</field>
-            <field name="default_code">SW24</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="public_categ_id" ref="Switch"/>
             <field name="standard_price">55.0</field>
@@ -790,10 +969,14 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_47" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_47"/>
+            <field name="default_code">SW24</field>
+        </record>
 
-        <record id="product_product_48" model="product.product">
+
+        <record id="product_template_48" model="product.template">
             <field name="name">USB Adapter</field>
-            <field name="default_code">ADPT</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">13.0</field>
             <field name="list_price">18.0</field>
@@ -801,328 +984,333 @@ QWERTY keyboard</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
+        <record id="product_product_48" model="product.product">
+            <field name="product_tmpl_id" ref="product_template_48"/>
+            <field name="default_code">ADPT</field>
+        </record>
+
 
         <!--
     Resource: product.supplierinfo
     -->
 
         <record id="product_supplierinfo_1" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_6"/>
+            <field name="product_id" ref="product_template_6"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_2" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_6"/>
+            <field name="product_id" ref="product_template_6"/>
             <field name="name" ref="base.res_partner_4"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_3" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_7"/>
+            <field name="product_id" ref="product_template_7"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_4" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_7"/>
+            <field name="product_id" ref="product_template_7"/>
             <field name="name" ref="base.res_partner_4"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_5" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_8"/>
+            <field name="product_id" ref="product_template_8"/>
             <field name="name" ref="base.res_partner_16"/>
             <field name="delay">2</field>
             <field name="min_qty">5</field>
         </record>
 
         <record id="product_supplierinfo_6" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_8"/>
+            <field name="product_id" ref="product_template_8"/>
             <field name="name" ref="base.res_partner_8"/>
             <field name="delay">4</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_7" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_10"/>
+            <field name="product_id" ref="product_template_10"/>
             <field name="name" ref="base.res_partner_16"/>
             <field name="delay">2</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_8" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_11"/>
+            <field name="product_id" ref="product_template_11"/>
             <field name="name" ref="base.res_partner_16"/>
             <field name="delay">2</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_9" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_13"/>
+            <field name="product_id" ref="product_template_13"/>
             <field name="name" ref="base.res_partner_4"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_10" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_14"/>
+            <field name="product_id" ref="product_template_14"/>
             <field name="name" ref="base.res_partner_4"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_11" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_15"/>
+            <field name="product_id" ref="product_template_15"/>
             <field name="name" ref="base.res_partner_4"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_12" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_15"/>
+            <field name="product_id" ref="product_template_15"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">1</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_13" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_16"/>
+            <field name="product_id" ref="product_template_16"/>
             <field name="name" ref="base.res_partner_3"/>
             <field name="delay">1</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_14" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_17"/>
+            <field name="product_id" ref="product_template_17"/>
             <field name="name" ref="base.res_partner_19"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_15" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_20"/>
+            <field name="product_id" ref="product_template_20"/>
             <field name="name" ref="base.res_partner_4"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_16" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_20"/>
+            <field name="product_id" ref="product_template_20"/>
             <field name="name" ref="base.res_partner_16"/>
             <field name="delay">4</field>
             <field name="min_qty">5</field>
         </record>
 
         <record id="product_supplierinfo_17" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_21"/>
+            <field name="product_id" ref="product_template_21"/>
             <field name="name" ref="base.res_partner_4"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_18" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_21"/>
+            <field name="product_id" ref="product_template_21"/>
             <field name="name" ref="base.res_partner_16"/>
             <field name="delay">2</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_19" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_22"/>
+            <field name="product_id" ref="product_template_22"/>
             <field name="name" ref="base.res_partner_19"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_20" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_23"/>
+            <field name="product_id" ref="product_template_23"/>
             <field name="name" ref="base.res_partner_19"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_21" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_24"/>
+            <field name="product_id" ref="product_template_24"/>
             <field name="name" ref="base.res_partner_19"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_22" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_25"/>
+            <field name="product_id" ref="product_template_25"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">8</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_23" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_26"/>
+            <field name="product_id" ref="product_template_26"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">8</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_24" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_28"/>
+            <field name="product_id" ref="product_template_28"/>
             <field name="name" ref="base.res_partner_19"/>
             <field name="delay">4</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_25" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_28"/>
+            <field name="product_id" ref="product_template_28"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_26" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_29"/>
+            <field name="product_id" ref="product_template_29"/>
             <field name="name" ref="base.res_partner_3"/>
             <field name="delay">2</field>
             <field name="min_qty">12</field>
         </record>
 
         <record id="product_supplierinfo_27" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_30"/>
+            <field name="product_id" ref="product_template_30"/>
             <field name="name" ref="base.res_partner_3"/>
             <field name="delay">2</field>
             <field name="min_qty">12</field>
         </record>
 
         <record id="product_supplierinfo_28" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_31"/>
+            <field name="product_id" ref="product_template_31"/>
             <field name="name" ref="base.res_partner_3"/>
             <field name="delay">2</field>
             <field name="min_qty">5</field>
         </record>
 
         <record id="product_supplierinfo_29" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_32"/>
+            <field name="product_id" ref="product_template_32"/>
             <field name="name" ref="base.res_partner_3"/>
             <field name="delay">2</field>
             <field name="min_qty">12</field>
         </record>
 
         <record id="product_supplierinfo_30" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_34"/>
+            <field name="product_id" ref="product_template_34"/>
             <field name="name" ref="base.res_partner_16"/>
             <field name="delay">2</field>
             <field name="min_qty">5</field>
         </record>
 
         <record id="product_supplierinfo_31" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_35"/>
+            <field name="product_id" ref="product_template_35"/>
             <field name="name" ref="base.res_partner_8"/>
             <field name="delay">2</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_32" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_36"/>
+            <field name="product_id" ref="product_template_36"/>
             <field name="name" ref="base.res_partner_8"/>
             <field name="delay">2</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_33" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_38"/>
+            <field name="product_id" ref="product_template_38"/>
             <field name="name" ref="base.res_partner_22"/>
             <field name="delay">4</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_34" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_39"/>
+            <field name="product_id" ref="product_template_39"/>
             <field name="name" ref="base.res_partner_22"/>
             <field name="delay">4</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_35" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_45"/>
+            <field name="product_id" ref="product_template_45"/>
             <field name="name" ref="base.res_partner_22"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_36" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_46"/>
+            <field name="product_id" ref="product_template_46"/>
             <field name="name" ref="base.res_partner_22"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_37" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_47"/>
+            <field name="product_id" ref="product_template_47"/>
             <field name="name" ref="base.res_partner_8"/>
             <field name="delay">7</field>
             <field name="min_qty">1</field>
         </record>
 
         <!--record id="product_supplierinfo_38" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_48"/>
+            <field name="product_id" ref="product_template_48"/>
             <field name="name" ref="base.res_partner_8"/>
             <field name="delay">7</field>
             <field name="min_qty">1</field>
         </record-->
 
         <record id="product_supplierinfo_39" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_18"/>
+            <field name="product_id" ref="product_template_18"/>
             <field name="name" ref="base.res_partner_19"/>
             <field name="delay">4</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_40" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_19"/>
+            <field name="product_id" ref="product_template_19"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">4</field>
             <field name="min_qty">0</field>
         </record>
 
         <record id="product_supplierinfo_41" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_19"/>
+            <field name="product_id" ref="product_template_19"/>
             <field name="name" ref="base.res_partner_8"/>
             <field name="delay">5</field>
             <field name="min_qty">0</field>
         </record>
 
         <record id="product_supplierinfo_42" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_33"/>
+            <field name="product_id" ref="product_template_33"/>
             <field name="name" ref="base.res_partner_3"/>
             <field name="delay">2</field>
             <field name="min_qty">0</field>
         </record>
 
         <record id="product_supplierinfo_43" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_9"/>
+            <field name="product_id" ref="product_template_9"/>
             <field name="name" ref="base.res_partner_8"/>
             <field name="delay">4</field>
             <field name="min_qty">0</field>
         </record>
 
         <record id="product_supplierinfo_44" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_27"/>
+            <field name="product_id" ref="product_template_27"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">10</field>
             <field name="min_qty">0</field>
         </record>
 
         <record id="product_supplierinfo_45" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_12"/>
+            <field name="product_id" ref="product_template_12"/>
             <field name="name" ref="base.res_partner_16"/>
             <field name="delay">3</field>
             <field name="min_qty">0</field>
         </record>
 
         <record id="product_supplierinfo_46" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_37"/>
+            <field name="product_id" ref="product_template_37"/>
             <field name="name" ref="base.res_partner_22"/>
             <field name="delay">5</field>
             <field name="min_qty">0</field>