diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 9b5980754ab..d379bc79e50 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -641,119 +641,135 @@ QWERTY keyboard</field>
     Resource: product.supplierinfo
     -->
 
-        <record id="supplierinfo1" model="product.supplierinfo">
+        <record id="product_supplierinfo_1" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_1"/>
             <field name="qty">10</field>
             <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_7"/>
             <field name="delay">5</field>
         </record>
-        <record id="supplierinfo2" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_2" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_1"/>
             <field name="qty">10</field>
             <field name="min_qty">1</field>
             <field name="product_id" ref="product_product_6"/>
             <field name="delay">5</field>
         </record>
-        <record id="supplierinfo3" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_3" 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_7"/>
             <field name="delay">1</field>
         </record>
-        <record id="supplierinfo4" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_4" 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_6"/>
             <field name="delay">1</field>
         </record>
-        <record id="supplierinfo5" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_5" 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_3"/>
             <field name="delay">2</field>
         </record>
-        <record id="supplierinfo6" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_6" 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_4"/>
             <field name="delay">2</field>
         </record>
-        <record id="supplierinfo7" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_7" 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_5"/>
             <field name="delay">2</field>
         </record>
-        <record id="supplierinfo8" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_8" 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_6"/>
             <field name="delay">1</field>
         </record>
-        <record id="supplierinfo9" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_9" 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_9"/>
             <field name="delay">1</field>
         </record>
-        <record id="supplierinfo10" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_10" 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_10"/>
             <field name="delay">1</field>
         </record>
-        <record id="supplierinfo11" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_11" 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_11"/>
             <field name="delay">1</field>
         </record>
-        <record id="supplierinfo12" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_12" 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_12"/>
             <field name="delay">1</field>
         </record>
-        <record id="supplierinfo13" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_13" 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_13"/>
             <field name="delay">1</field>
         </record>
-        <record id="supplierinfo14" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_14" 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="delay">5</field>
         </record>
-        <record id="supplierinfo15" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_15" 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="delay">5</field>
         </record>
-        <record id="supplierinfo16" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_16" 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="delay">5</field>
         </record>
-        <record id="supplierinfo17" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_17" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_19"/>
             <field name="qty">10</field>
             <field name="min_qty">1</field>
@@ -761,7 +777,8 @@ QWERTY keyboard</field>
             <field name="product_id" ref="product_product_11"/>
             <field name="delay">5</field>
         </record>
-        <record id="supplierinfo18" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_18" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_19"/>
             <field name="qty">10</field>
             <field name="min_qty">1</field>
@@ -769,7 +786,8 @@ QWERTY keyboard</field>
             <field name="product_id" ref="product_product_12"/>
             <field name="delay">5</field>
         </record>
-        <record id="supplierinfo19" model="product.supplierinfo">
+
+        <record id="product_supplierinfo_19" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_4"/>
             <field name="qty">10</field>
             <field name="min_qty">1</field>
@@ -778,75 +796,63 @@ QWERTY keyboard</field>
             <field name="delay">5</field>
         </record>
 
-        <!--
-    Resource: product.supplierinfo NEW for training
-    -->
-
-        <record id="product_supplierinfo_0" model="product.supplierinfo">
+        <record id="product_supplierinfo_20" model="product.supplierinfo">
             <field name="product_id" ref="product_product_39"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_22"/>
         </record>
 
-
-        <record id="product_supplierinfo_1" model="product.supplierinfo">
+        <record id="product_supplierinfo_21" model="product.supplierinfo">
             <field name="product_id" ref="product_product_39"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_22"/>
         </record>
 
-
-        <record id="product_supplierinfo_2" model="product.supplierinfo">
+        <record id="product_supplierinfo_22" model="product.supplierinfo">
             <field name="product_id" ref="product_product_40"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_22"/>
         </record>
 
-
-        <record id="product_supplierinfo_3" model="product.supplierinfo">
+        <record id="product_supplierinfo_223" model="product.supplierinfo">
              <field name="product_id" ref="product_product_41"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_22"/>
         </record>
 
-
-        <record id="product_supplierinfo_4" model="product.supplierinfo">
+        <record id="product_supplierinfo_24" model="product.supplierinfo">
             <field name="product_id" ref="product_product_29"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_22"/>
         </record>
 
-
-        <record id="product_supplierinfo_5" model="product.supplierinfo">
+        <record id="product_supplierinfo_25" model="product.supplierinfo">
             <field name="product_id" ref="product_product_30"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_22"/>
         </record>
 
-
-        <record id="product_supplierinfo_6" model="product.supplierinfo">
+        <record id="product_supplierinfo_26" model="product.supplierinfo">
             <field name="product_id" ref="product_product_44"/>
             <field name="delay">2</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_22"/>
         </record>
 
-
-        <record id="product_supplierinfo_7" model="product.supplierinfo">
+        <record id="product_supplierinfo_27" model="product.supplierinfo">
             <field name="product_id" ref="product_product_45"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="name" ref="base.res_partner_22"/>
         </record>
 
-
-        <record id="product_supplierinfo_8" model="product.supplierinfo">
+        <record id="product_supplierinfo_28" model="product.supplierinfo">
             <field name="product_id" ref="product_product_46"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>