diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index a331d5c8b6b..3bd67ca7e61 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -693,112 +693,112 @@
             <field name="name" ref="base.res_partner_asus"/>
             <field name="qty">10</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_mb1"/>
+            <field name="product_template_id" ref="product_product_mb1"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo2" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_asus"/>
             <field name="qty">10</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_mb2"/>
+            <field name="product_template_id" ref="product_product_mb2"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo3" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_mb1"/>
+            <field name="product_template_id" ref="product_product_mb1"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo4" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_mb2"/>
+            <field name="product_template_id" ref="product_product_mb2"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo5" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_pc1"/>
+            <field name="product_template_id" ref="product_product_pc1"/>
             <field name="delay">2</field>
         </record>
         <record id="supplierinfo6" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_pc2"/>
+            <field name="product_template_id" ref="product_product_pc2"/>
             <field name="delay">2</field>
         </record>
         <record id="supplierinfo7" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_pc3"/>
+            <field name="product_template_id" ref="product_product_pc3"/>
             <field name="delay">2</field>
         </record>
         <record id="supplierinfo8" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_pc4"/>
+            <field name="product_template_id" ref="product_product_pc4"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo9" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_cpu1"/>
+            <field name="product_template_id" ref="product_product_cpu1"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo10" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_cpu3"/>
+            <field name="product_template_id" ref="product_product_cpu3"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo11" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_hdd1"/>
+            <field name="product_template_id" ref="product_product_hdd1"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo12" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_hdd2"/>
+            <field name="product_template_id" ref="product_product_hdd2"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo13" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_hdd3"/>
+            <field name="product_template_id" ref="product_product_hdd3"/>
             <field name="delay">1</field>
         </record>
         <record id="supplierinfo14" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_20"/>
+            <field name="product_template_id" ref="product_product_20"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo15" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_21"/>
+            <field name="product_template_id" ref="product_product_21"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo16" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">1</field>
             <field name="min_qty">1</field>
-            <field name="product_id" ref="product_product_22"/>
+            <field name="product_template_id" ref="product_product_22"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo17" model="product.supplierinfo">
@@ -806,7 +806,7 @@
             <field name="qty">10</field>
             <field name="min_qty">1</field>
             <field name="sequence">5</field>
-            <field name="product_id" ref="product_product_hdd1"/>
+            <field name="product_template_id" ref="product_product_hdd1"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo18" model="product.supplierinfo">
@@ -814,7 +814,7 @@
             <field name="qty">10</field>
             <field name="min_qty">1</field>
             <field name="sequence">5</field>
-            <field name="product_id" ref="product_product_hdd2"/>
+            <field name="product_template_id" ref="product_product_hdd2"/>
             <field name="delay">5</field>
         </record>
         <record id="supplierinfo19" model="product.supplierinfo">
@@ -822,7 +822,7 @@
             <field name="qty">10</field>
             <field name="min_qty">1</field>
             <field name="sequence">5</field>
-            <field name="product_id" ref="product_product_hdd3"/>
+            <field name="product_template_id" ref="product_product_hdd3"/>
             <field name="delay">5</field>
         </record>
 
@@ -831,7 +831,7 @@
     -->
 
         <record id="product_supplierinfo_0" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_rearpanelarm0"/>
+            <field name="product_template_id" ref="product_product_rearpanelarm0"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
@@ -839,7 +839,7 @@
 
 
         <record id="product_supplierinfo_1" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_rearpanelarm0"/>
+            <field name="product_template_id" ref="product_product_rearpanelarm0"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
@@ -847,7 +847,7 @@
 
 
         <record id="product_supplierinfo_2" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_rearpanelarm1"/>
+            <field name="product_template_id" ref="product_product_rearpanelarm1"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
@@ -855,7 +855,7 @@
 
 
         <record id="product_supplierinfo_3" model="product.supplierinfo">
-             <field name="product_id" ref="product_product_sidepanel0"/>
+             <field name="product_template_id" ref="product_product_sidepanel0"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
@@ -863,7 +863,7 @@
 
 
         <record id="product_supplierinfo_4" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_shelfofcm0"/>
+            <field name="product_template_id" ref="product_product_shelfofcm0"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
@@ -871,7 +871,7 @@
 
 
         <record id="product_supplierinfo_5" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_shelfofcm1"/>
+            <field name="product_template_id" ref="product_product_shelfofcm1"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
@@ -879,7 +879,7 @@
 
 
         <record id="product_supplierinfo_6" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_assemblysection0"/>
+            <field name="product_template_id" ref="product_product_assemblysection0"/>
             <field name="delay">2</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
@@ -887,7 +887,7 @@
 
 
         <record id="product_supplierinfo_7" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_woodlintelm0"/>
+            <field name="product_template_id" ref="product_product_woodlintelm0"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>
@@ -895,7 +895,7 @@
 
 
         <record id="product_supplierinfo_8" model="product.supplierinfo">
-            <field name="product_id" ref="product_product_metalcleats0"/>
+            <field name="product_template_id" ref="product_product_metalcleats0"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_woodywoodpecker0"/>