[IMP] Remove and clean product demo data

Remaining products :
- product_product_0 becomes service_order_01
- product_product_1b becomes service_cost_01
- product_product_43 becomes product_order_01
- product_product_47 becomes product_delivery_01
- prodcut_product becomes product_delivery_02
- Replace product_product_56 by service_delivery
- Replace product_product_59 by consu_delivery_01
- Replace product_product_58 by consu_delivery_02
- Replace product_product_57 by consu_delivery_03

Removed products :
- product_product_53, product_product_57, product_product_55, product_product_54, product_product_52,
  product_product_51, product_product_50, product_product_48, product_product_46, product_product_32,
  product_product_33, product_product_28, product_product_38, product_product_39, product_product_40,
  product_product_41, product_product_34, product_product_29, product_product_30, product_product_44,
  product_product_31, product_product_35, product_product_36, product_product_37, product_product_42,
  product_product_45, product_product_49, product_product_26, product_product_14, product_product_15,
  product_product_18, product_product_19, product_product_21, product_product_23

Removed corresponding binaries.

Removed all Bill of Materials demo data, that were ridiculous and replace them by 2 bom: A complete
computer, and a kit computer. Rewritten the tests accordingly.

Fixed tests :
- sale_mrp/test/cancellation_propagated.yml : The yaml ref function return a id, not a dictionnary
- sale_stock/tests/test_sale_stock.py : The service product invoiced on the delivered quantity was
  in fact not invoiced on delivery on the test. As we are in sale_stock, Without timesheet, we
  manually set the delivered qty for the product serv_del. If we don't do this, the invoice will
  never be fully invoiced.
- The pricelist rules choice is not based on the sequence anymore (Seems to be a bug, reported to
  online). By the way, I changed the product to avoid the overlap.
- sale_mrp/test/sale_mrp.yml: The yaml ref function return a id, not a dictionnary
- mrp : Rewritten the tests to be coherent with the new bom data

70 files changed, 370 insertions, 1735 deletions

diff --git a/addons/account/demo/account_invoice_demo.yml b/addons/account/demo/account_invoice_demo.yml
index be5023e33f4..a03fdc6818f 100644
--- a/addons/account/demo/account_invoice_demo.yml
+++ b/addons/account/demo/account_invoice_demo.yml
@@ -10,12 +10,12 @@
     type: 'out_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-01'
     invoice_line_ids:
-      - name: 'Dell Inspiron Laptop without OS'
-        product_id: product.product_product_49
+      - name: ''
+        product_id: product.consu_delivery_02
         price_unit: 642.0
         quantity: 5
-      - name: 'Linutop'
-        product_id: product.product_product_50
+      - name: ''
+        product_id: product.consu_delivery_03
         price_unit: 280.0
         quantity: 5.0
 -
@@ -27,12 +27,12 @@
     type: 'out_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-08'
     invoice_line_ids:
-      - name: '8-port Switch'
-        product_id: product.product_product_51
+      - name: ''
+        product_id: product.consu_delivery_03
         price_unit: 50.0
         quantity: 3
-      - name: '30m RJ45 wire'
-        product_id: product.product_product_52
+      - name: ''
+        product_id: product.consu_delivery_01
         price_unit: 25
         quantity: 20
 -
@@ -44,39 +44,17 @@
     type: 'out_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-08'
     invoice_line_ids:
-      - name: 'TypeMatrix Dvorak Keyboard'
-        product_id: product.product_product_53
+      - name: ''
+        product_id: product.consu_delivery_01
         price_unit: 90.0
         quantity: 5
-      - name: 'Ergonomic Mouse'
-        product_id: product.product_product_54
+      - name: ''
+        product_id: product.consu_delivery_03
         price_unit: 15.0
         quantity: 5.0
 -
   !workflow {model: account.invoice, action: invoice_open, ref: demo_invoice_3}
 -
-  !record {model: account.invoice, id: demo_invoice_invest_sale}:
-    company_id: base.main_company
-    partner_id: base.res_partner_3
-    type: 'out_invoice'
-    date_invoice: !eval time.strftime('%Y-%m')+'-08'
--
-  !python {model: ir.model.data} : |
-      account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_sale_of_land_account')])])
-      line_vals = {
-          'invoice_id': ref('demo_invoice_invest_sale'),
-          'name': "Land located at '50.635336,4.863298'",
-          'price_unit': 210600,
-      }
-      if account_id:
-          line_vals['account_id'] = account_id[0]
-          tax_id = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'sale'), ('amount', '>', 0)])
-          if tax_id:
-            line_vals['invoice_line_tax_ids'] = [(6, 0, [tax_id[0]])]
-          self._update(cr, uid, 'account.invoice.line', 'account', line_vals, 'sale_of_land_line')
-          self.pool.get('account.invoice').browse(cr, uid, ref('demo_invoice_invest_sale'))._onchange_invoice_line_ids()
-          self.pool.get('account.invoice').signal_workflow(cr, uid, [ref('demo_invoice_invest_sale')], 'invoice_open')
--
    Set the context for supplier bills because the 'type' field is readonly in invoice form views, so it value won't be considered by the yaml import
 -
   !context
@@ -91,15 +69,15 @@
     type: 'in_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-01'
     invoice_line_ids:
-      - name: 'Toner Cartridge'
+      - name: ''
         price_unit: 10.0
         quantity: 1.0
-        product_id: product.product_product_39
+        product_id: product.product_delivery_01
         uom_id: product.product_uom_unit
-      - name: 'Zed+ Antivirus'
+      - name: ''
         price_unit: 4.0
         quantity: 1.0
-        product_id: product.product_product_43
+        product_id: product.product_order_01
         uom_id: product.product_uom_unit
 -
   !record {model: account.invoice, id: demo_invoice_january_wages}:
diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml
index f6dc9d4e267..d7c00b8d461 100644
--- a/addons/account/test/account_invoice_state.yml
+++ b/addons/account/test/account_invoice_state.yml
@@ -5,7 +5,7 @@
     company_id: base.main_company
     currency_id: base.EUR
     invoice_line_ids:
-      - name: '[PCSC234] PC Assemble SC234'
+      - name: 'Computer SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account/views/account_unit_test.xml b/addons/account/views/account_unit_test.xml
index 250a7166c05..7f09e31abeb 100644
--- a/addons/account/views/account_unit_test.xml
+++ b/addons/account/views/account_unit_test.xml
@@ -20,7 +20,7 @@
         </record>
         <record id="test_invoice_1_line_1" model="account.invoice.line">
             <field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
-            <field name="product_id" ref="product.product_product_57"/>
+            <field name="product_id" ref="product.consu_delivery_03"/>
             <field name="invoice_id" ref="test_invoice_1"/>
             <field name="price_unit">250</field>
             <field name="quantity">1</field>
@@ -28,7 +28,7 @@
         </record>
         <record id="test_invoice_1_line_2" model="account.invoice.line">
             <field name="name">Little server with raid 1 and 512ECC ram</field>
-            <field name="product_id" ref="product.product_product_58"/>
+            <field name="product_id" ref="product.consu_delivery_02"/>
             <field name="invoice_id" ref="test_invoice_1"/>
             <field name="price_unit">800</field>
             <field name="quantity">2</field>
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index ff05a2d3a99..18ebfa7ba84 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -2,36 +2,24 @@
 <openerp>
     <data>
 
-<!-- Demo Data for Memberships  -->
-    <record id="membership_0" model="product.product">
+    <!-- Demo Data for Memberships  -->
+    <record id="product.membership_0" model="product.product">
         <field name="membership">True</field>
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
         <field eval="time.strftime('%Y-12-31')" name="membership_date_to"/>
-        <field name="name">Gold Membership</field>
-        <field name="list_price">180</field>
-        <field name="categ_id" ref="product.product_category_1"/>
-        <field name="type">service</field>
-        <field name="image" type="base64" file="membership/static/img/membership_0-image.jpg"/>
+        <field name="active" eval="True"/>
     </record>
-    <record id="membership_1" model="product.product">
+    <record id="product.membership_1" model="product.product">
         <field name="membership">True</field>
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
         <field eval="time.strftime('%Y-12-31')" name="membership_date_to"/>
-        <field name="name">Silver Membership</field>
-        <field name="categ_id" ref="product.product_category_1"/>
-        <field name="list_price">80</field>
-        <field name="type">service</field>
-        <field name="image" type="base64" file="membership/static/img/membership_1-image.jpg"/>
+        <field name="active" eval="True"/>
     </record>
-    <record id="membership_2" model="product.product">
+    <record id="product.membership_2" model="product.product">
         <field name="membership">True</field>
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
         <field eval="time.strftime('%Y-12-31')" name="membership_date_to"/>
-        <field name="name">Basic Membership</field>
-        <field name="categ_id" ref="product.product_category_1"/>
-        <field name="list_price">40</field>
-        <field name="type">service</field>
-        <field name="image" type="base64" file="membership/static/img/membership_2-image.jpg"/>
+        <field name="active" eval="True"/>
     </record>
 
     </data>
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 974babcc799..f07417b2c1c 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -238,467 +238,161 @@
         <!-- Resource: mrp.bom -->
 
 
-        <record id="product.product_product_18_product_template" model="product.template">
+        <record id="product.product_product_3_product_template" model="product.template">
             <field name="route_ids" eval="[(6, 0, [ref('stock.route_warehouse0_mto'), ref('mrp.route_warehouse0_manufacture')])]"/>
         </record>
-        <record id="mrp_bom_1" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_18_product_template"/>
+        <record id="mrp_bom_manufacture" model="mrp.bom">
+            <field name="product_tmpl_id" ref="product.product_product_3_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>
+            <field name="sequence">10</field>
             <field name="routing_id" ref="mrp_routing_0"/>
+            <field name="property_ids" eval="[(6,0,[ref('mrp_property_4')])]"/>
         </record>
 
-        <record id="mrp_bom_line_1" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_17"/>
-            <field name="product_qty">2</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>            
-            <field name="bom_id" ref="mrp_bom_1"/>
-        </record>
-
-        <record id="product.product_product_19_product_template" model="product.template">
-            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
-        </record>
-        <record id="mrp_bom_2" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_19_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>            
-            <field name="routing_id" ref="mrp_routing_1"/>
-        </record>
-
-        <record id="mrp_bom_line_2" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_18"/>
-            <field name="product_qty">4</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>            
-            <field name="bom_id" ref="mrp_bom_2"/>
-        </record>
-
-        <record id="mrp_bom_3" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_19_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">10</field>            
-        </record>
-
-        <record id="mrp_bom_line_3" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_17"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>            
-            <field name="bom_id" ref="mrp_bom_3"/>
-        </record>
-
-        <record id="product.product_product_27_product_template" model="product.template">
-            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
-        </record>
-        <record id="mrp_bom_4" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_27_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>            
-            <field name="routing_id" ref="mrp_routing_1"/>
-        </record>
-
-        <record id="mrp_bom_line_4" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_40"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">2</field>            
-            <field name="bom_id" ref="mrp_bom_4"/>
-        </record>
-
-        <record id="mrp_bom_line_5" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_8"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">4</field>            
-            <field name="bom_id" ref="mrp_bom_4"/>
-        </record>
-
-        <record id="mrp_bom_line_6" model="mrp.bom.line">
+        <record id="mrp_bom_manufacture_line_1" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_12"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">6</field>            
-            <field name="bom_id" ref="mrp_bom_4"/>
-        </record>
-
-        <record id="mrp_bom_5" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_27_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">10</field>            
-        </record>
-
-        <record id="mrp_bom_line_7" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_40"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">2</field>            
-            <field name="bom_id" ref="mrp_bom_5"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_manufacture"/>
         </record>
 
-        <record id="mrp_bom_line_8" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_9"/>
+        <record id="mrp_bom_manufacture_line_2" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_13"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">4</field>            
-            <field name="bom_id" ref="mrp_bom_5"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_manufacture"/>
         </record>
 
-        <record id="mrp_bom_line_9" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_11"/>
+        <record id="mrp_bom_manufacture_line_3" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">6</field>            
-            <field name="bom_id" ref="mrp_bom_5"/>
-        </record>
-
-        <record id="product.product_product_16_product_template" model="product.template">
-            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
-        </record>
-        <record id="mrp_bom_6" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_16_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_manufacture"/>
         </record>
 
-        <record id="mrp_bom_line_10" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_23"/>
+        <record id="mrp_bom_manufacture_line_4" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_17"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">4</field>            
-            <field name="bom_id" ref="mrp_bom_6"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_manufacture"/>
         </record>
 
-        <record id="mrp_bom_line_11" model="mrp.bom.line">
+        <record id="mrp_bom_manufacture_line_5" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_20"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">6</field>            
-            <field name="bom_id" ref="mrp_bom_6"/>
-        </record>
-
-        <record id="mrp_bom_line_12" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_17"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">8</field>            
-            <field name="bom_id" ref="mrp_bom_6"/>
-        </record>
-
-        <record id="mrp_bom_7" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_16_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">10</field>            
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_manufacture"/>
         </record>
 
-        <record id="mrp_bom_line_13" model="mrp.bom.line">
+        <record id="mrp_bom_manufacture_line_6" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_22"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">2</field>            
-            <field name="bom_id" ref="mrp_bom_7"/>
-        </record>
-
-        <record id="mrp_bom_line_14" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_21"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">4</field>            
-            <field name="bom_id" ref="mrp_bom_7"/>
-        </record>
-
-        <record id="mrp_bom_line_15" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_18"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">6</field>            
-            <field name="bom_id" ref="mrp_bom_7"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_manufacture"/>
         </record>
 
-        <record id="mrp_bom_line_16" model="mrp.bom.line">
+        <record id="mrp_bom_manufacture_line_7" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_24"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">10</field>            
-            <field name="bom_id" ref="mrp_bom_7"/>
-        </record>
-
-        <record id="product.product_product_3_product_template" model="product.template">
-            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
-        </record>
-        <record id="mrp_bom_8" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_3_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_manufacture"/>
         </record>
 
-        <record id="mrp_bom_property_0" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_3_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>
-            <field name="property_ids" eval="[(6,0,[ref('mrp_property_0')])]"/>
-        </record>
-
-        <record id="mrp_bom_no_property_line" model="mrp.bom">
-            <field name="product_id" ref="product.product_product_14"/>
-            <field name="product_tmpl_id" ref="product.product_product_14_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>
-            <field name="code">default</field>
-            <field name="type">phantom</field>
-        </record>
-        <record id="mrp_bom_line_no_prop_1" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_13"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">1</field>
-            <field name="bom_id" ref="mrp_bom_no_property_line"/>
-        </record>
-        <record id="mrp_bom_line_no_prop_2" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_12"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">1</field>
-            <field name="bom_id" ref="mrp_bom_no_property_line"/>
-        </record>
-        <record id="mrp_bom_line_no_prop_3" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_11"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">1</field>
-            <field name="bom_id" ref="mrp_bom_no_property_line"/>
-        </record>
-
-
-
-        <record id="mrp_bom_property_line" model="mrp.bom">
-            <field name="product_id" ref="product.product_product_14"/>
-            <field name="product_tmpl_id" ref="product.product_product_14_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">5</field>
-            <field name="type">phantom</field>
-            <field name="property_ids" eval="[(6,0,[ref('mrp_property_0')])]"/>
-        </record>
-
-        <record id="mrp_bom_line_17" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_6"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">2</field>            
-            <field name="bom_id" ref="mrp_bom_8"/>
-        </record>
-
-        <record id="mrp_bom_line_18" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_16"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">4</field>            
-            <field name="bom_id" ref="mrp_bom_8"/>
-        </record>
-
-        <record id="mrp_bom_line_19" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_11"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">6</field>            
-            <field name="bom_id" ref="mrp_bom_8"/>
-        </record>
-
-        <record id="mrp_bom_line_20" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_8"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">8</field>            
-            <field name="bom_id" ref="mrp_bom_8"/>
-        </record>
-
-        <record id="mrp_bom_line_21" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_15"/>
-            <field name="product_qty">2</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">10</field>            
-            <field name="bom_id" ref="mrp_bom_8"/>
+        <record id="product.product_product_5_product_template" model="product.template">
+            <field name="route_ids" eval="[(6, 0, [ref('stock.route_warehouse0_mto'), ref('mrp.route_warehouse0_manufacture')])]"/>
         </record>
-
-        <record id="mrp_bom_9" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_3_product_template"/>
+        <record id="mrp_bom_kit" model="mrp.bom">
+            <field name="product_tmpl_id" ref="product.product_product_5_product_template"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">4</field>
+            <field name="sequence">15</field>
             <field name="routing_id" ref="mrp_routing_2"/>
             <field name="type">phantom</field>
         </record>
 
-        <record id="mrp_bom_line_22" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_7"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">2</field>            
-            <field name="bom_id" ref="mrp_bom_9"/>
-        </record>
-
-        <record id="mrp_bom_line_23" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_16"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">4</field>            
-            <field name="bom_id" ref="mrp_bom_9"/>
-        </record>
-
-        <record id="mrp_bom_line_24" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_11"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">6</field>            
-            <field name="bom_id" ref="mrp_bom_9"/>
-        </record>
-
-        <record id="mrp_bom_line_25" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_8"/>
+        <record id="mrp_bom_kit_line_1" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_12"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">8</field>            
-            <field name="bom_id" ref="mrp_bom_9"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_kit"/>
         </record>
 
-        <record id="mrp_bom_line_26" model="mrp.bom.line">
+        <record id="mrp_bom_kit_line_2" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_13"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">10</field>            
-            <field name="bom_id" ref="mrp_bom_9"/>
-        </record>
-
-        <record id="product.product_product_5_product_template" model="product.template">
-            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
-        </record>
-        <record id="mrp_bom_10" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_5_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="sequence">5</field>            
-            <field name="routing_id" ref="mrp_routing_2"/>
-            <field name="type">phantom</field>
+            <field name="bom_id" ref="mrp_bom_kit"/>
         </record>
 
-        <record id="mrp_bom_line_27" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_6"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">2</field>            
-            <field name="bom_id" ref="mrp_bom_10"/>
-        </record>
-
-        <record id="mrp_bom_line_28" model="mrp.bom.line">
+        <record id="mrp_bom_kit_line_3" model="mrp.bom.line">
             <field name="product_id" ref="product.product_product_16"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">4</field>            
-            <field name="bom_id" ref="mrp_bom_10"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_kit"/>
         </record>
 
-        <record id="mrp_bom_line_29" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_13"/>
+        <record id="mrp_bom_kit_line_4" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_17"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">6</field>            
-            <field name="bom_id" ref="mrp_bom_10"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_kit"/>
         </record>
 
-        <record id="mrp_bom_line_30" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_11"/>
+        <record id="mrp_bom_kit_line_5" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_20"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">8</field>            
-            <field name="bom_id" ref="mrp_bom_10"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_kit"/>
         </record>
 
-        <record id="mrp_bom_line_31" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_8"/>
+        <record id="mrp_bom_kit_line_6" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_22"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">10</field>            
-            <field name="bom_id" ref="mrp_bom_10"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_kit"/>
         </record>
 
-        <record id="product.product_product_4_product_template" model="product.template">
-            <field name="route_ids" eval="[(6, 0, [ref('mrp.route_warehouse0_manufacture')])]"/>
-        </record>
-        <record id="mrp_bom_11" model="mrp.bom">
-            <field name="product_tmpl_id" ref="product.product_product_4_product_template"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">1</field>            
-        </record>
-        <record id="mrp_bom_line_32" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_14"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">1</field>            
-            <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_1')])]"/>
-            <field name="bom_id" ref="mrp_bom_11"/>
-        </record>
-        <record id="mrp_bom_line_33" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_15"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">2</field>            
-            <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_2')])]"/>
-            <field name="bom_id" ref="mrp_bom_11"/>
-        </record>
-        <record id="mrp_bom_line_34" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_23"/>
+        <record id="mrp_bom_kit_line_7" model="mrp.bom.line">
+            <field name="product_id" ref="product.product_product_24"/>
             <field name="product_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">3</field>            
-            <field name="bom_id" ref="mrp_bom_11"/>
+            <field name="sequence">5</field>            
+            <field name="bom_id" ref="mrp_bom_kit"/>
         </record>
 
-        <record id="mrp_bom_line_prop_1" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_13"/>
-            <field name="product_qty">1</field>
+        <record id="mrp_production_1" model="mrp.production">
+            <field name="product_id" ref="product.product_product_3"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">1</field>
-            <field name="property_ids" eval="[(6,0,[ref('mrp_property_8')])]"/>
-            <field name="bom_id" ref="mrp_bom_property_line"/>
+            <field name="product_qty">3</field>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="location_dest_id" ref="stock.stock_location_output"/>
+            <field name="bom_id" ref="mrp_bom_manufacture"/>
+            <field name="routing_id" ref="mrp.mrp_routing_2"/>
         </record>
 
-        <record id="mrp_bom_line_prop_2" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_12"/>
-            <field name="product_qty">1</field>
+        <record id="mrp_production_2" model="mrp.production">
+            <field name="product_id" ref="product.product_product_5"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">1</field>
-            <field name="property_ids" eval="[(6,0,[ref('mrp_property_0')])]"/>
-            <field name="bom_id" ref="mrp_bom_property_line"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="location_dest_id" ref="stock.stock_location_output"/>
+            <field name="bom_id" ref="mrp.mrp_bom_kit"/>
+            <field name="routing_id" ref="mrp.mrp_routing_1"/>
         </record>
+        <workflow action="button_confirm" model="mrp.production" ref="mrp_production_1"/>
 
-        <record id="mrp_bom_line_prop_3" model="mrp.bom.line">
-            <field name="product_id" ref="product.product_product_11"/>
-            <field name="product_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="sequence">1</field>
-            <field name="bom_id" ref="mrp_bom_property_line"/>
-        </record>
-
-
-    <record id="mrp_production_1" model="mrp.production">
-        <field name="product_id" ref="product.product_product_3"/>
-        <field name="product_uom" ref="product.product_uom_unit"/>
-        <field name="product_qty">3</field>
-        <field name="location_src_id" ref="stock.stock_location_stock"/>
-        <field name="location_dest_id" ref="stock.stock_location_output"/>
-        <field name="bom_id" ref="mrp_bom_8"/>
-        <field name="routing_id" ref="mrp.mrp_routing_2"/>
-    </record>
-
-    <record id="mrp_production_2" model="mrp.production">
-        <field name="product_id" ref="product.product_product_27"/>
-        <field name="product_uom" ref="product.product_uom_unit"/>
-        <field name="location_src_id" ref="stock.stock_location_stock"/>
-        <field name="location_dest_id" ref="stock.stock_location_output"/>
-        <field name="bom_id" ref="mrp.mrp_bom_4"/>
-        <field name="routing_id" ref="mrp.mrp_routing_1"/>
-    </record>
-    <workflow action="button_confirm" model="mrp.production" ref="mrp_production_1"/>
-
-    <!-- Run Scheduler -->
-    <function model="procurement.order" name="run_scheduler"/>
+        <!-- Run Scheduler -->
+        <function model="procurement.order" name="run_scheduler"/>
     </data>
 </openerp>
diff --git a/addons/mrp/test/bom_with_service_type_product.yml b/addons/mrp/test/bom_with_service_type_product.yml
index 1fd5c832a4f..711c0d99e7b 100644
--- a/addons/mrp/test/bom_with_service_type_product.yml
+++ b/addons/mrp/test/bom_with_service_type_product.yml
@@ -12,13 +12,14 @@
       - product_id: product.product_product_2
         product_uom: product.product_uom_unit
         product_qty: 1.0
-      - product_id: product.product_product_44
+      - product_id: product.consu_delivery_01
         product_uom: product.product_uom_unit
         product_qty: 1.0
 -
   I make the production order using BoM having one service type product and one consumable product.
 -
   !record {model: mrp.production, id: mrp_production_servicetype_mo1}:
+    name: 'MO-Test'
     product_id: product.product_product_3
     product_qty: 1.0
     bom_id: mrp_bom_test1
diff --git a/addons/mrp/test/order_demo.yml b/addons/mrp/test/order_demo.yml
index d25ef12032f..ec8b2dcc6ae 100644
--- a/addons/mrp/test/order_demo.yml
+++ b/addons/mrp/test/order_demo.yml
@@ -4,14 +4,14 @@
   !context
     uid: 'res_users_mrp_user'
 -
-  I create Production Order of PC Assemble SC349 to produce 5.0 Unit.
+  I create Production Order of Computer SC234 to produce 5.0 Unit.
 -
   !record {model: mrp.production, id: mrp_production_test1}:
     product_id: product.product_product_3
     product_qty: 5.0
     location_src_id: stock.stock_location_14
     location_dest_id: stock.stock_location_output
-    bom_id: mrp_bom_9
+    bom_id: mrp_bom_kit
     routing_id: mrp.mrp_routing_1
     
     
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index c2537e1e663..38638fc6cfc 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -14,7 +14,7 @@
 -
   !python {model: mrp.production}: |
     order = self.browse(cr, uid, ref("mrp_production_test1"), context=context)
-    assert len(order.product_lines) == 5, "Production lines are not generated proper."
+    assert len(order.product_lines) == 7, "Production lines are not generated proper."
 -
   Now I check workcenter lines.
 -
diff --git a/addons/mrp_byproduct/test/mrp_byproduct.yml b/addons/mrp_byproduct/test/mrp_byproduct.yml
index 758a7fc2efd..23a458241a5 100644
--- a/addons/mrp_byproduct/test/mrp_byproduct.yml
+++ b/addons/mrp_byproduct/test/mrp_byproduct.yml
@@ -4,11 +4,11 @@
 -
   I add a sub product in Bill of material for product External Hard Disk.
 -
-  !record {model: mrp.bom, id: mrp.mrp_bom_9}:
-    product_id: product.product_product_28
+  !record {model: mrp.bom, id: mrp.mrp_bom_kit}:
+    product_id: product.product_delivery_02
     product_uom: product.product_uom_unit
     sub_products:
-      - product_id: product.product_product_33
+      - product_id: product.product_delivery_01
         product_uom: product.product_uom_unit
         product_qty: 2.0
         subproduct_type: fixed
@@ -16,10 +16,10 @@
   I create a production order for External Hard Disk.
 -
   !record {model: mrp.production, id: mrp_production_mo0}:
-    product_id: product.product_product_28
+    product_id: product.product_delivery_02
     product_qty: 2.0
     product_uom: product.product_uom_unit
-    bom_id: mrp.mrp_bom_9
+    bom_id: mrp.mrp_bom_kit
     location_src_id: stock.stock_location_stock
 -
   I compute the data of production order.
@@ -40,7 +40,7 @@
   This move is created automatically when I confirmed the production order.
 -
   !python {model: stock.move}: |
-    move_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_33'))])
+    move_ids = self.search(cr, uid, [('product_id','=',ref('product.product_delivery_01'))])
     assert move_ids, 'No moves are created !'
 -
   I want to start the production so I force the reservation of products.
@@ -74,6 +74,6 @@
 -
   !python {model: stock.move}: |
     production_order = self.pool.get('mrp.production').browse(cr, uid, ref("mrp_production_mo0"))
-    move_ids = self.search(cr, uid, [('origin','=',production_order.name), ('product_id','in',[ref("product.product_product_28"),ref("product.product_product_33")])])
+    move_ids = self.search(cr, uid, [('origin','=',production_order.name), ('product_id','in',[ref("product.product_delivery_02"),ref("product.product_delivery_01")])])
     moves = self.browse(cr, uid, move_ids)
     assert all(move.state == 'done' for move in moves), 'Moves are not done!'
diff --git a/addons/mrp_operations/mrp_operations_demo.yml b/addons/mrp_operations/mrp_operations_demo.yml
index 196d978bcc1..b7e37885c4d 100644
--- a/addons/mrp_operations/mrp_operations_demo.yml
+++ b/addons/mrp_operations/mrp_operations_demo.yml
@@ -1,7 +1,7 @@
 -
   !record {model: mrp.production, id: mrp_production_op}:
     location_src_id: stock.stock_location_stock
-    product_id: product.product_product_5
+    product_id: product.product_product_3
     product_qty: 5.0
     allow_reorder: True
 -
@@ -10,15 +10,10 @@
     product_id: product.product_product_5
     product_qty: 2.0
 -
-  !function {model: mrp.production, name: action_compute, id: mrp_production_op1}:
-  - model: mrp.production
-    eval: "[obj(ref('mrp_production_op1')).id]"
--
-  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_op1}
--
-  !record {model: mrp.production, id: mrp_production_mo1}:
-    location_src_id: stock.stock_location_stock
-    product_id: product.product_product_16
-    product_qty: 5.0
--
-  !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1}
+  !python {model: mrp.production}: |
+    # test compute, then confirm
+    self.action_compute(cr, uid, ref('mrp_production_op1'), properties=[self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'mrp.mrp_property_4')], context=context)
+    self.action_confirm(cr, uid, ref('mrp_production_op1'), context=context)
+
+    self.action_compute(cr, uid, ref('mrp_production_op'), properties=[self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'mrp.mrp_property_4')], context=context)
+    self.action_confirm(cr, uid, ref('mrp_production_op'), context=context)
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 37f3e8de630..b9fc7784dbf 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -553,53 +553,24 @@
         <record id="product.product_product_11" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.product_product_12" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.product_product_13" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_14" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_15" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.product_product_16" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.product_product_17" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_18" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_19" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.product_product_20" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_21" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.product_product_22" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_23" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.product_product_24" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.product_product_25" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_26" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.product_product_27" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_28" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_29" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_30" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_31" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_32" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_33" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_34" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_35" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_36" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_37" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_38" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_39" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_40" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_41" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_42" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_43" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_44" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_45" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_46" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_47" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_48" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_49" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_50" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_51" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_52" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_53" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_54" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_55" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_56" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_57" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_58" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="product.product_product_59" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.product_delivery_02" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.product_delivery_01" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.product_order_01" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.service_delivery" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.consu_delivery_03" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.consu_delivery_02" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.consu_delivery_01" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="sale.advance_product_0" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.membership_0" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.membership_1" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+        <record id="product.membership_2" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
 
 
 
diff --git a/addons/procurement/test/procurement.yml b/addons/procurement/test/procurement.yml
index 1f89e28bbdb..daba7374ec2 100644
--- a/addons/procurement/test/procurement.yml
+++ b/addons/procurement/test/procurement.yml
@@ -4,7 +4,7 @@
   !record {model: procurement.order, id: procurement_order0}:
     company_id: base.main_company
     name: Procurement Test
-    product_id: product.product_product_32
+    product_id: product.product_delivery_01
     product_qty: 15.0
     product_uom: product.product_uom_unit
 -
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index e9ce67f56c7..07b93f2563a 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -6,10 +6,6 @@
             <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
         </record>
 
-    <!--
-    Resource: product.category
-    -->
- 
         <record id="product_category_2" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Internal</field>
@@ -27,13 +23,7 @@
             <field name="name">Physical</field>
         </record>
 
-    <!-- Apple Products -->
-        <!--
-    Resource: product.product
-    -->
-
-
-        <record id="product_product_0" model="product.product">
+        <record id="service_order_01" model="product.product">
             <field name="name">Prepaid Consulting</field>
             <field name="categ_id" ref="product_category_3"/>
             <field name="standard_price">40</field>
@@ -42,20 +32,21 @@
             <field name="uom_id" ref="product_uom_hour"/>
             <field name="uom_po_id" ref="product_uom_hour"/>
             <field name="description">Example of product to invoice on order.</field>
+            <field name="default_code">SERV_ORDER</field>
         </record>
 
-        <record id="product_product_1" model="product.product">
-            <field name="name">GAP Analysis Service</field>
-            <field name="categ_id" ref="product_category_3"/>
-            <field name="standard_price">20.5</field>
-            <field name="list_price">30.75</field>
+        <record id="service_delivery" model="product.product">
+            <field name="name">Cost-plus Contract</field>
+            <field name="categ_id" ref="product_category_5"/>
+            <field name="standard_price">200.0</field>
+            <field name="list_price">180.0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="product_uom_hour"/>
-            <field name="uom_po_id" ref="product_uom_hour"/>
-            <field name="description">Example of products to invoice based on delivery.</field>
+            <field name="uom_id" ref="product_uom_unit"/>
+            <field name="uom_po_id" ref="product_uom_unit"/>
+            <field name="default_code">SERV_DEL</field>
         </record>
 
-        <record id="product_product_1b" model="product.product">
+        <record id="service_cost_01" model="product.product">
             <field name="name">External Audit</field>
             <field name="categ_id" ref="product_category_3"/>
             <field name="standard_price">160</field>
@@ -64,8 +55,52 @@
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Example of products to invoice based on cost.</field>
+            <field name="default_code">SERV_COST</field>
+        </record>
+
+        <record id="product_delivery_01" model="product.product">
+            <field name="name">Switch, 24 ports</field>
+            <field name="categ_id" ref="product_category_5"/>
+            <field name="standard_price">55.0</field>
+            <field name="list_price">70.0</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="default_code">PROD_DEL</field>
+        </record>
+
+        <record id="product_delivery_02" model="product.product">
+            <field name="name">Datacard</field>
+            <field name="categ_id" ref="product_category_5"/>
+            <field name="standard_price">35.0</field>
+            <field name="list_price">40.0</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="default_code">PROD_DEL02</field>
         </record>
 
+        <record id="product_order_01" model="product.product">
+            <field name="name">Zed+ Antivirus</field>
+            <field name="categ_id" ref="product_category_4"/>
+            <field name="standard_price">235.0</field>
+            <field name="list_price">280.0</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="default_code">PROD_ORDER</field>
+        </record>
+
+        <record id="product_product_1" model="product.product">
+            <field name="name">GAP Analysis Service</field>
+            <field name="categ_id" ref="product_category_3"/>
+            <field name="standard_price">20.5</field>
+            <field name="list_price">30.75</field>
+            <field name="type">service</field>
+            <field name="uom_id" ref="product_uom_hour"/>
+            <field name="uom_po_id" ref="product_uom_hour"/>
+            <field name="description">Example of products to invoice based on delivery.</field>
+        </record>
 
         <record id="product_product_2" model="product.product">
             <field name="name">Support Services</field>
@@ -94,7 +129,7 @@ HDD SH-1</field>
             <field name="default_code">PCSC234</field>
         </record>
 
-        <!-- -->
+        <!-- Ecommerce Variants and Products -->
 
         <record id="product_attribute_1" model="product.attribute">
             <field name="name">Memory</field>
@@ -139,21 +174,21 @@ HDD SH-1</field>
             <field name="description_sale">7.9‑inch (diagonal) LED-backlit, 128Gb
 Dual-core A5 with quad-core graphics
 FaceTime HD Camera, 1.2 MP Photos</field>
-            <field name="default_code">A2323</field>
+            <field name="default_code">E-COM01</field>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_1'), ref('product.product_attribute_value_3')])]"/>
         </record>
         <record id="product_product_4b" model="product.product">
-            <field name="default_code">A2324</field>
+            <field name="default_code">E-COM02</field>
             <field name="product_tmpl_id" ref="product_product_4_product_template"/>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_1'), ref('product.product_attribute_value_4')])]"/>
         </record>
         <record id="product_product_4c" model="product.product">
-            <field name="default_code">A2325</field>
+            <field name="default_code">E-COM03</field>
             <field name="product_tmpl_id" ref="product_product_4_product_template"/>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_2'), ref('product.product_attribute_value_3')])]"/>
         </record>
         <record id="product_product_4d" model="product.product">
-            <field name="default_code">A2326</field>
+            <field name="default_code">E-COM04</field>
             <field name="product_tmpl_id" ref="product_product_4_product_template"/>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_2'), ref('product.product_attribute_value_4')])]"/>
         </record>
@@ -188,8 +223,6 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="price_extra">50.40</field>
         </record>
 
-        <!-- -->
-
         <record id="product_product_5b" model="product.product">
             <field name="name">Bose Mini Bluetooth Speaker</field>
             <field name="categ_id" ref="product_category_5"/>
@@ -199,7 +232,7 @@ 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"/>
             <field name="description_sale">Bose's smallest portable Bluetooth speaker</field>
-            <field name="default_code">B3423</field>
+            <field name="default_code">E-COM05</field>
         </record>
 
 
@@ -212,7 +245,7 @@ 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"/>
             <field name="description">Custom computer shipped in kit.</field>
-            <field name="default_code">B3424</field>
+            <field name="default_code">E-COM06</field>
         </record>
 
         <record id="product_product_6" model="product.product">
@@ -223,7 +256,7 @@ 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="default_code">A1232</field>
+            <field name="default_code">E-COM07</field>
             <field name='weight'>0.330</field>
         </record>
 
@@ -235,7 +268,7 @@ 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="default_code">A8767</field>
+            <field name="default_code">E-COM08</field>
         </record>
 
         <record id="product_product_8" model="product.product">
@@ -246,7 +279,7 @@ 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="default_code">A1090</field>
+            <field name="default_code">E-COM09</field>
             <field name='weight'>9.54</field>
         </record>
 
@@ -258,7 +291,7 @@ 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="default_code">AK789</field>
+            <field name="default_code">E-COM10</field>
         </record>
 
         <record id="product_product_10" model="product.product">
@@ -269,11 +302,9 @@ 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="default_code">M-Opt</field>
+            <field name="default_code">E-COM11</field>
         </record>
 
-        <!-- -->
-
         <record id="product_product_11" model="product.product">
             <field name="name">iPod</field>
             <field name="categ_id" ref="product_category_5"/>
@@ -282,11 +313,11 @@ 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="default_code">A6678</field>
+            <field name="default_code">E-COM12</field>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_1')])]"/>
         </record>
         <record id="product_product_11b" model="product.product">
-            <field name="default_code">A6679</field>
+            <field name="default_code">E-COM13</field>
             <field name="product_tmpl_id" ref="product_product_11_product_template"/>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_2')])]"/>
         </record>
@@ -307,7 +338,7 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="price_extra">6.40</field>
         </record>
 
-        <!-- -->
+        <!-- MRP Demo Data-->
 
         <record id="product_product_12" model="product.product">
             <field name="name">Mouse, Wireless</field>
@@ -331,28 +362,6 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="default_code">RAM-SR5</field>
         </record>
 
-        <record id="product_product_14" model="product.product">
-            <field name="name">RAM SR2 (kit)</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">87.0</field>
-            <field name="list_price">95.0</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="default_code">RAM-SR2</field>
-        </record>
-
-        <record id="product_product_15" model="product.product">
-            <field name="name">RAM SR3</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">80.0</field>
-            <field name="list_price">85.0</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="default_code">RAM-SR3</field>
-        </record>
-
         <record id="product_product_16" model="product.product">
             <field name="name">Computer Case</field>
             <field name="categ_id" ref="product_category_5"/>
@@ -375,29 +384,6 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="default_code">HDD-SH1</field>
         </record>
 
-        <record id="product_product_18" model="product.product">
-            <field name="name">HDD SH-2 (mto)</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">1020.0</field>
-            <field name="list_price">1150.0</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="default_code">HDD-SH2</field>
-        </record>
-
-        <record id="product_product_19" model="product.product">
-            <field name="name">HDD on Demand</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">1100.0</field>
-            <field name="list_price">1250.0</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="description">On demand hard-disk having capacity based on requirement.</field>
-            <field name="default_code">HDD-DEM</field>
-        </record>
-
         <record id="product_product_20" model="product.product">
             <field name="name">Motherboard I9P57</field>
             <field name="categ_id" ref="product_category_5"/>
@@ -408,18 +394,6 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="default_code">MBi9</field>
         </record>
-
-        <record id="product_product_21" model="product.product">
-            <field name="name">Motherboard A20Z7</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">1790.0</field>
-            <field name="list_price">2000.0</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="default_code">MBa20</field>
-        </record>
-
         <record id="product_product_22" model="product.product">
             <field name="name">Processor Core i5 2.70 Ghz</field>
             <field name="categ_id" ref="product_category_5"/>
@@ -431,17 +405,6 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="default_code">CPUi5</field>
         </record>
 
-        <record id="product_product_23" model="product.product">
-            <field name="name">Processor AMD 8-Core</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">1910.0</field>
-            <field name="list_price">1980.0</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="default_code">CPUa8</field>
-        </record>
-
         <record id="product_product_24" model="product.product">
             <field name="name">Graphics Card</field>
             <field name="categ_id" ref="product_category_5"/>
@@ -468,21 +431,6 @@ QWERTY keyboard</field>
             <field name="default_code">LAP-E5</field>
         </record>
 
-        <record id="product_product_26" model="product.product">
-            <field name="name">Laptop S3450</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">3000.0</field>
-            <field name="list_price">3245.0</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="description">17" Monitor
-6GB RAM
-Hi-Speed 234Q Processor
-QWERTY keyboard</field>
-            <field name="default_code">LAP-S3</field>
-        </record>
-
         <record id="product_product_27" model="product.product">
             <field name="name">Laptop Customized</field>
             <field name="categ_id" ref="product_category_5"/>
@@ -495,357 +443,7 @@ QWERTY keyboard</field>
             <field name="default_code">LAP-CUS</field>
         </record>
 
-        <record id="product_product_28" model="product.product">
-            <field name="name">External Hard disk</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">390.0</field>
-            <field name="list_price">405.0</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="default_code">EXT-HDD</field>
-        </record>
-
-
-        <record id="product_product_29" model="product.product">
-            <field name="name">Pen drive, SP-2</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">90.0</field>
-            <field name="list_price">100.0</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="default_code">PD-SP2</field>
-        </record>
-
-
-        <record id="product_product_30" model="product.product">
-            <field name="name">Pen drive, SP-4</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">126.0</field>
-            <field name="list_price">145.0</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="default_code">PD-SP4</field>
-        </record>
-
-        <record id="product_product_31" model="product.product">
-            <field name="name">Multimedia Speakers</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">134.0</field>
-            <field name="list_price">150.0</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="description">.</field>
-            <field name="default_code">MM-SPK</field>
-        </record>
-
-        <record id="product_product_32" model="product.product">
-            <field name="name">Headset standard</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">57.0</field>
-            <field name="list_price">62.0</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="description">Hands free headset for laptop PC with in-line microphone and headphone plug.</field>
-            <field name="default_code">HEAD</field>
-        </record>
-
-        <record id="product_product_33" model="product.product">
-            <field name="name">Headset USB</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">60.0</field>
-            <field name="list_price">65.0</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="description">Headset for laptop PC with USB connector.</field>
-            <field name="default_code">HEAD-USB</field>
-        </record>
-
-
-        <record id="product_product_34" model="product.product">
-            <field name="name">Webcam</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">38.0</field>
-            <field name="list_price">45.0</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="default_code">WCAM</field>
-        </record>
-
-
-        <record id="product_product_35" model="product.product">
-            <field name="name">Blank CD</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">18.40</field>
-            <field name="list_price">20.0</field>
-            <field name="type">consu</field>
-            <field name="uom_id" ref="product_uom_dozen"/>
-            <field name="uom_po_id" ref="product_uom_dozen"/>
-            <field name="default_code">CD</field>
-        </record>
-
-
-        <record id="product_product_36" model="product.product">
-            <field name="name">Blank DVD-RW</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">21.60</field>
-            <field name="list_price">24.0</field>
-            <field name="type">consu</field>
-            <field name="uom_id" ref="product_uom_dozen"/>
-            <field name="uom_po_id" ref="product_uom_dozen"/>
-            <field name="default_code">DVD</field>
-        </record>
-
-
-        <record id="product_product_37" model="product.product">
-            <field name="name">Printer, All-in-one</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">4258.0</field>
-            <field name="list_price">4410.0</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="description">All in one hi-speed printer with fax and scanner.</field>
-            <field name="default_code">PRINT</field>
-        </record>
-
-
-        <record id="product_product_38" model="product.product">
-            <field name="name">Ink Cartridge</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">60.0</field>
-            <field name="list_price">65.0</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="default_code">INK</field>
-        </record>
-
-
-        <record id="product_product_39" model="product.product">
-            <field name="name">Toner Cartridge</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">66.0</field>
-            <field name="list_price">70.0</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="default_code">TONER</field>
-        </record>
-
-
-        <record id="product_product_40" model="product.product">
-            <field name="name">Windows 7 Professional</field>
-            <field name="categ_id" ref="product_category_4"/>
-            <field name="standard_price">330.0</field>
-            <field name="list_price">470.0</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="default_code">Win7</field>
-        </record>
-
-
-        <record id="product_product_41" model="product.product">
-            <field name="name">Windows Home Server 2011</field>
-            <field name="categ_id" ref="product_category_4"/>
-            <field name="standard_price">540.0</field>
-            <field name="list_price">620.0</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="default_code">WServer</field>
-        </record>
-
-
-        <record id="product_product_42" model="product.product">
-            <field name="name">Office Suite</field>
-            <field name="categ_id" ref="product_category_4"/>
-            <field name="standard_price">110.0</field>
-            <field name="list_price">170.0</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="description_sale">Office Editing Software with word processing, spreadsheets, presentations, graphics, and databases...</field>
-            <field name="default_code">OSuite</field>
-        </record>
-
-
-        <record id="product_product_43" model="product.product">
-            <field name="name">Zed+ Antivirus</field>
-            <field name="categ_id" ref="product_category_4"/>
-            <field name="standard_price">235.0</field>
-            <field name="list_price">280.0</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="default_code">Zplus</field>
-        </record>
-
-
-        <record id="product_product_44" model="product.product">
-            <field name="name">GrapWorks Software</field>
-            <field name="categ_id" ref="product_category_4"/>
-            <field name="standard_price">155.0</field>
-            <field name="list_price">173.0</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="description_sale">Full featured image editing software.</field>
-            <field name="default_code">GRAPs/w</field>
-        </record>
-
-
-        <record id="product_product_45" model="product.product">
-            <field name="name">Router R430</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">55.0</field>
-            <field name="list_price">60.0</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="default_code">ROUT_430</field>
-        </record>
-
-
-        <record id="product_product_46" model="product.product">
-            <field name="name">Datacard</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">35.0</field>
-            <field name="list_price">40.0</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="default_code">DC</field>
-        </record>
-
-
-        <record id="product_product_47" model="product.product">
-            <field name="name">Switch, 24 ports</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">55.0</field>
-            <field name="list_price">70.0</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="default_code">SW24</field>
-        </record>
-
-
-        <record id="product_product_48" model="product.product">
-            <field name="name">USB Adapter</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">13.0</field>
-            <field name="list_price">18.0</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="default_code">ADPT</field>
-        </record>
-
-
-        <record id="product_product_49" model="product.product">
-            <field name="name">Dell Inspiron Laptop without OS</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">46900.0</field>
-            <field name="list_price">44000.0</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="default_code">DELL15</field>
-        </record>
-
-
-        <record id="product_product_50" model="product.product">
-            <field name="name">Linutop</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">26400.0</field>
-            <field name="list_price">25000.0</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="default_code">LIN12</field>
-        </record>
-
-
-        <record id="product_product_51" model="product.product">
-            <field name="name">8-port Switch</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">725.0</field>
-            <field name="list_price">600.0</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="default_code">SIW162</field>
-        </record>
-
-
-        <record id="product_product_52" model="product.product">
-            <field name="name">30m RJ45 wire</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">300.0</field>
-            <field name="list_price">250.0</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="default_code">RJ45</field>
-        </record>
-
-
-        <record id="product_product_53" model="product.product">
-            <field name="name">TypeMatrix Dvorak Keyboard</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">3500.0</field>
-            <field name="list_price">3000.0</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="default_code">TDKEY1</field>
-        </record>
-
-
-        <record id="product_product_54" model="product.product">
-            <field name="name">Ergonomic Mouse</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">400.0</field>
-            <field name="list_price">300.0</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="default_code">ERMO85</field>
-        </record>
-
-
-        <record id="product_product_55" model="product.product">
-            <field name="name">Desktop Computer Table</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">2000.0</field>
-            <field name="list_price">1800.0</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="default_code">DSKTAB96</field>
-        </record>
-
-
-        <record id="product_product_56" model="product.product">
-            <field name="name">Desktop Lamp</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">200.0</field>
-            <field name="list_price">180.0</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="default_code">DSKLM12</field>
-        </record>
-
-        <record id="product_product_57" model="product.product">
+        <record id="consu_delivery_03" model="product.product">
             <field name="name">Basic Computer</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">25000.0</field>
@@ -855,10 +453,10 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description_sale">Dvorak keyboard 
             left-handed mouse</field>
-            <field name="default_code">BASICCOMP</field>
+            <field name="default_code">CONS_DEL03</field>
         </record>
 
-        <record id="product_product_58" model="product.product">
+        <record id="consu_delivery_02" model="product.product">
             <field name="name">Little server</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">45000.0</field>
@@ -868,10 +466,10 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description_sale">raid 1 
             512ECC ram</field>
-            <field name="default_code">LTLSRVR</field>
+            <field name="default_code">CONS_DEL02</field>
         </record>
 
-        <record id="product_product_59" model="product.product">
+        <record id="consu_delivery_01" model="product.product">
             <field name="name">Server</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">65000.0</field>
@@ -881,7 +479,33 @@ QWERTY keyboard</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description_sale">raid 10 
             2048ECC ram</field>
-            <field name="default_code">SERVER</field>
+            <field name="default_code">CONS_DEL01</field>
+        </record>
+
+        <!-- Membership products -->
+
+        <record id="membership_0" model="product.product">
+            <field name="name">Gold Membership</field>
+            <field name="list_price">180</field>
+            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="type">service</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="membership_1" model="product.product">
+            <field name="name">Silver Membership</field>
+            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="list_price">80</field>
+            <field name="type">service</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="membership_2" model="product.product">
+            <field name="name">Basic Membership</field>
+            <field name="categ_id" ref="product.product_category_1"/>
+            <field name="list_price">40</field>
+            <field name="type">service</field>
+            <field name="active" eval="False"/>
         </record>
 
         <!--
@@ -969,30 +593,6 @@ QWERTY keyboard</field>
         </record>
 
         <record id="product_supplierinfo_10" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_14_product_template"/>
-            <field name="name" ref="base.res_partner_4"/>
-            <field name="delay">5</field>
-            <field name="min_qty">1</field>
-            <field name="price">87</field>
-        </record>
-
-        <record id="product_supplierinfo_11" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_15_product_template"/>
-            <field name="name" ref="base.res_partner_4"/>
-            <field name="delay">5</field>
-            <field name="min_qty">1</field>
-            <field name="price">80</field>
-        </record>
-
-        <record id="product_supplierinfo_12" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_15_product_template"/>
-            <field name="name" ref="base.res_partner_1"/>
-            <field name="delay">1</field>
-            <field name="min_qty">1</field>
-            <field name="price">82</field>
-        </record>
-
-        <record id="product_supplierinfo_13" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_16_product_template"/>
             <field name="name" ref="base.res_partner_3"/>
             <field name="delay">1</field>
@@ -1000,7 +600,7 @@ QWERTY keyboard</field>
             <field name="price">20</field>
         </record>
 
-        <record id="product_supplierinfo_14" model="product.supplierinfo">
+        <record id="product_supplierinfo_11" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_17_product_template"/>
             <field name="name" ref="base.res_partner_2"/>
             <field name="delay">3</field>
@@ -1008,7 +608,7 @@ QWERTY keyboard</field>
             <field name="price">860</field>
         </record>
 
-        <record id="product_supplierinfo_15" model="product.supplierinfo">
+        <record id="product_supplierinfo_12" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_20_product_template"/>
             <field name="name" ref="base.res_partner_4"/>
             <field name="delay">3</field>
@@ -1016,7 +616,7 @@ QWERTY keyboard</field>
             <field name="price">1700</field>
         </record>
 
-        <record id="product_supplierinfo_16" model="product.supplierinfo">
+        <record id="product_supplierinfo_13" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_20_product_template"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">4</field>
@@ -1024,23 +624,7 @@ QWERTY keyboard</field>
             <field name="price">1720</field>
         </record>
 
-        <record id="product_supplierinfo_17" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_21_product_template"/>
-            <field name="name" ref="base.res_partner_4"/>
-            <field name="delay">3</field>
-            <field name="min_qty">1</field>
-            <field name="price">1790</field>
-        </record>
-
-        <record id="product_supplierinfo_18" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_21_product_template"/>
-            <field name="name" ref="base.res_partner_1"/>
-            <field name="delay">2</field>
-            <field name="min_qty">1</field>
-            <field name="price">1795</field>
-        </record>
-
-        <record id="product_supplierinfo_19" model="product.supplierinfo">
+        <record id="product_supplierinfo_14" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_22_product_template"/>
             <field name="name" ref="base.res_partner_2"/>
             <field name="delay">3</field>
@@ -1048,15 +632,7 @@ QWERTY keyboard</field>
             <field name="price">2010</field>
         </record>
 
-        <record id="product_supplierinfo_20" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_23_product_template"/>
-            <field name="name" ref="base.res_partner_2"/>
-            <field name="delay">3</field>
-            <field name="min_qty">1</field>
-            <field name="price">1910</field>
-        </record>
-
-        <record id="product_supplierinfo_21" model="product.supplierinfo">
+        <record id="product_supplierinfo_15" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_24_product_template"/>
             <field name="name" ref="base.res_partner_2"/>
             <field name="delay">3</field>
@@ -1064,7 +640,7 @@ QWERTY keyboard</field>
             <field name="price">876</field>
         </record>
 
-        <record id="product_supplierinfo_22" model="product.supplierinfo">
+        <record id="product_supplierinfo_16" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_25_product_template"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">8</field>
@@ -1072,159 +648,47 @@ QWERTY keyboard</field>
             <field name="price">2870</field>
         </record>
 
-        <record id="product_supplierinfo_23" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_26_product_template"/>
-            <field name="name" ref="base.res_partner_1"/>
-            <field name="delay">8</field>
-            <field name="min_qty">1</field>
-            <field name="price">3000</field>
-        </record>
-
-        <record id="product_supplierinfo_24" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_28_product_template"/>
+        <record id="product_supplierinfo_17" model="product.supplierinfo">
+            <field name="product_tmpl_id" ref="product_delivery_02_product_template"/>
             <field name="name" ref="base.res_partner_2"/>
             <field name="delay">4</field>
             <field name="min_qty">1</field>
             <field name="price">390</field>
         </record>
 
-        <record id="product_supplierinfo_25" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_28_product_template"/>
-            <field name="name" ref="base.res_partner_1"/>
-            <field name="delay">5</field>
-            <field name="min_qty">1</field>
-            <field name="price">395</field>
-        </record>
-
-        <record id="product_supplierinfo_26" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_29_product_template"/>
+        <record id="product_supplierinfo_18" model="product.supplierinfo">
+            <field name="product_tmpl_id" ref="product_delivery_01_product_template"/>
             <field name="name" ref="base.res_partner_3"/>
             <field name="delay">2</field>
             <field name="min_qty">12</field>
             <field name="price">90</field>
         </record>
 
-        <record id="product_supplierinfo_27" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_30_product_template"/>
-            <field name="name" ref="base.res_partner_3"/>
-            <field name="delay">2</field>
-            <field name="min_qty">12</field>
-            <field name="price">126</field>
-        </record>
-
-        <record id="product_supplierinfo_28" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_31_product_template"/>
-            <field name="name" ref="base.res_partner_3"/>
-            <field name="delay">2</field>
-            <field name="min_qty">5</field>
-            <field name="price">134</field>
-        </record>
-
-        <record id="product_supplierinfo_29" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_32_product_template"/>
-            <field name="name" ref="base.res_partner_3"/>
-            <field name="delay">2</field>
-            <field name="min_qty">12</field>
-            <field name="price">57</field>
-        </record>
-
-        <record id="product_supplierinfo_30" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_34_product_template"/>
-            <field name="name" ref="base.res_partner_1"/>
-            <field name="delay">2</field>
-            <field name="min_qty">5</field>
-            <field name="price">38</field>
-        </record>
-
-        <record id="product_supplierinfo_31" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_35_product_template"/>
-            <field name="name" ref="base.res_partner_12"/>
-            <field name="delay">2</field>
-            <field name="min_qty">1</field>
-            <field name="price">18.40</field>
-        </record>
-
-        <record id="product_supplierinfo_32" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_36_product_template"/>
-            <field name="name" ref="base.res_partner_12"/>
-            <field name="delay">2</field>
-            <field name="min_qty">1</field>
-            <field name="price">21.60</field>
-        </record>
-
-        <record id="product_supplierinfo_33" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_38_product_template"/>
-            <field name="name" ref="base.res_partner_1"/>
-            <field name="delay">4</field>
-            <field name="min_qty">1</field>
-            <field name="price">60</field>
-        </record>
-
-        <record id="product_supplierinfo_34" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_39_product_template"/>
+        <record id="product_supplierinfo_19" model="product.supplierinfo">
+            <field name="product_tmpl_id" ref="product_delivery_01_product_template"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">4</field>
             <field name="min_qty">1</field>
             <field name="price">66</field>
         </record>
 
-        <record id="product_supplierinfo_35" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_45_product_template"/>
-            <field name="name" ref="base.res_partner_1"/>
-            <field name="delay">5</field>
-            <field name="min_qty">1</field>
-            <field name="price">55</field>
-        </record>
-
-        <record id="product_supplierinfo_36" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_46_product_template"/>
+        <record id="product_supplierinfo_20" model="product.supplierinfo">
+            <field name="product_tmpl_id" ref="product_delivery_02_product_template"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">5</field>
             <field name="min_qty">1</field>
             <field name="price">35</field>
         </record>
 
-        <record id="product_supplierinfo_37" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_47_product_template"/>
+        <record id="product_supplierinfo_21" model="product.supplierinfo">
+            <field name="product_tmpl_id" ref="product_delivery_01_product_template"/>
             <field name="name" ref="base.res_partner_12"/>
             <field name="delay">7</field>
             <field name="min_qty">1</field>
             <field name="price">55</field>
         </record>
 
-        <record id="product_supplierinfo_39" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_18_product_template"/>
-            <field name="name" ref="base.res_partner_2"/>
-            <field name="delay">4</field>
-            <field name="min_qty">1</field>
-            <field name="price">1020</field>
-        </record>
-
-        <record id="product_supplierinfo_40" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_19_product_template"/>
-            <field name="name" ref="base.res_partner_1"/>
-            <field name="delay">4</field>
-            <field name="min_qty">0</field>
-            <field name="price">1100</field>
-        </record>
-
-        <record id="product_supplierinfo_41" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_19_product_template"/>
-            <field name="name" ref="base.res_partner_12"/>
-            <field name="delay">5</field>
-            <field name="min_qty">0</field>
-            <field name="price">1125</field>
-        </record>
-
-        <record id="product_supplierinfo_42" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_33_product_template"/>
-            <field name="name" ref="base.res_partner_3"/>
-            <field name="delay">2</field>
-            <field name="min_qty">0</field>
-            <field name="price">60</field>
-        </record>
-
-        <record id="product_supplierinfo_43" model="product.supplierinfo">
+        <record id="product_supplierinfo_22" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_9_product_template"/>
             <field name="name" ref="base.res_partner_12"/>
             <field name="delay">4</field>
@@ -1232,7 +696,7 @@ QWERTY keyboard</field>
             <field name="price">10</field>
         </record>
 
-        <record id="product_supplierinfo_44" model="product.supplierinfo">
+        <record id="product_supplierinfo_23" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_27_product_template"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">10</field>
@@ -1240,7 +704,7 @@ QWERTY keyboard</field>
             <field name="price">3300</field>
         </record>
 
-        <record id="product_supplierinfo_45" model="product.supplierinfo">
+        <record id="product_supplierinfo_24" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_12_product_template"/>
             <field name="name" ref="base.res_partner_1"/>
             <field name="delay">3</field>
@@ -1248,15 +712,7 @@ QWERTY keyboard</field>
             <field name="price">12.50</field>
         </record>
 
-        <record id="product_supplierinfo_46" model="product.supplierinfo">
-            <field name="product_tmpl_id" ref="product_product_37_product_template"/>
-            <field name="name" ref="base.res_partner_1"/>
-            <field name="delay">5</field>
-            <field name="min_qty">0</field>
-            <field name="price">4258</field>
-        </record>
-
-        <record id="product_supplierinfo_47" model="product.supplierinfo">
+        <record id="product_supplierinfo_25" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_12_product_template"/>
             <field name="name" ref="base.res_partner_4"/>
             <field name="delay">2</field>
diff --git a/addons/product/product_image_demo.xml b/addons/product/product_image_demo.xml
index bb26ceeb915..8b2d57f34d5 100644
--- a/addons/product/product_image_demo.xml
+++ b/addons/product/product_image_demo.xml
@@ -58,14 +58,6 @@
             <field name="image" type="base64" file="product/static/img/product_product_13-image.jpg"/>
         </record>
 
-        <record id="product_product_14" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_14-image.jpg"/>
-        </record>
-
-        <record id="product_product_15" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_15-image.jpg"/>
-        </record>
-
         <record id="product_product_16" model="product.product">
             <field name="image" type="base64" file="product/static/img/product_product_16-image.jpg"/>
         </record>
@@ -74,30 +66,14 @@
             <field name="image" type="base64" file="product/static/img/product_product_17-image.jpg"/>
         </record>
 
-        <record id="product_product_18" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_18-image.jpg"/>
-        </record>
-
-        <record id="product_product_19" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_19-image.jpg"/>
-        </record>
-
         <record id="product_product_20" model="product.product">
             <field name="image" type="base64" file="product/static/img/product_product_20-image.jpg"/>
         </record>
 
-        <record id="product_product_21" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_21-image.jpg"/>
-        </record>
-
         <record id="product_product_22" model="product.product">
             <field name="image" type="base64" file="product/static/img/product_product_22-image.jpg"/>
         </record>
 
-        <record id="product_product_23" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_23-image.jpg"/>
-        </record>
-
         <record id="product_product_24" model="product.product">
             <field name="image" type="base64" file="product/static/img/product_product_24-image.jpg"/>
         </record>
@@ -106,97 +82,29 @@
             <field name="image" type="base64" file="product/static/img/product_product_25-image.jpg"/>
         </record>
 
-        <record id="product_product_26" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_26-image.jpg"/>
-        </record>
-
         <record id="product_product_27" model="product.product">
             <field name="image" type="base64" file="product/static/img/product_product_27-image.jpg"/>
         </record>
 
-        <record id="product_product_28" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_28-image.jpg"/>
-        </record>
-
-        <record id="product_product_29" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_29-image.jpg"/>
-        </record>
-
-        <record id="product_product_30" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_30-image.jpg"/>
-        </record>
-
-        <record id="product_product_31" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_31-image.jpg"/>
-        </record>
-
-        <record id="product_product_32" model="product.product">
-            <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODAK/9sAQwAGBAUGBQQGBgUGBwcGCAoQCgoJCQoUDg8MEBcUGBgXFBYWGh0lHxobIxwWFiAsICMmJykqKRkfLTAtKDAlKCko/9sAQwEHBwcKCAoTCgoTKBoWGigoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgo/8AAEQgA0ADQAwEiAAIRAQMRAf/EAB0AAQADAQEBAQEBAAAAAAAAAAAGBwgFBAEDCQL/xABBEAABAwMBBAUJBgQFBQAAAAABAAIDBAURBgcSITETQVFhgQgUIjJxkaGxwRUjQlJi0TNDcpIWJFOCsiU0ovDx/8QAFwEBAQEBAAAAAAAAAAAAAAAAAAECA//EABwRAQEAAwEBAQEAAAAAAAAAAAABAhExIUESUf/aAAwDAQACEQMRAD8A1SiIgIiICIiAiIgIThCcKutqW0236LpnQRltTdXNy2HPCPsc/s9nWgmt6vFvstI6qulXDSwD8UjsZ7gOZ8FT+qNv9qopHw2OikrHjh0sp3Ge7n78KjLpeNS7Qb6xpNTW1cxxFBEDy7gPVarf0L5PtO2OOq1fVGSTGfMqZ261v9T+Z8FF8Qq87b9XXJ5ZQyxUjXcm08eXe/iudTybTtROD4BfqhrusbzG/RassmkbDZI2stdpoqcNGA5sQLveeK7objlwHYi7ZEdprarTM6Xze8tA4+jOSfg5eWPaHtC0vUNbW1VfHun+HWM3mn+4fVbFwvHc7XR3SndBcaWCphcMFsrA4fFVNqS0Pt+pKx8dNqik81kPDzmAEsz+pvV4K8LdW01fTR1NFPHPTyDLJI3bwPiqC2o7Do2wzXLR4c17QXPoic5H6D9FWmzTaFdtDXboH9JJRb+7UUcnDHbjPIoabSRczTt6or9aKa422US007ctPWD1gjqI7F0xxCIIiICIiAiIgIiICIiAiIgIUXgvlzprNaqu418ojpaaMySOPUB9erxQQza/tAg0VZd2FzX3WpaRTxn8A/Oe4dXessWu13fW2o4mt6Wqrq2QuG+c9fGR/Y0L5qO/VmvNX1dyrd7oS7IYPwMHBrB/72rUmxvRMembIKyriaLrWsDpOH8Fn4Yx2YGM9/sReOns30FbNF2oQ0rGzV8gHnFW4elIesDsb2BTIBfQMIiCIiAiIg+OHBUH5QmziOopn6nssIbUxcaqNg4Pb+fHzV+r86iJk0L4pWNfG8FrmuGQQepFjKewnXbtPXhtBWyEWuscGPDjwhf1O/fuWr2ngMclinalpp+i9d1NIwFtDOelgd+gnh7uXgtLbFNTu1Joun6eTeraI+bzcck49V3iPkhYsFECIgiIgIiICIiAiIgIiIBWd/Kw1eaSgodM0khElT/maoNP8sHDWn2nj4BaGfw4nksH6+vB1rtYrqguLqaWq6NmOqGPI92AfegsTyetIfal5p5quPegpAKyfI4Oef4bPDmtWtGFANilmFs0XBUvbuz3BxqX8OTTwYPAAe9WAhRERAREQEREBERBSnlQ6dFx0jBdoWAz0Em64/od+xx71X3k1ajNDq0UMr8Q3GMxEH/Ubkt+o8VpHWtuZddKXaiezfE1M8BvaQMj4hYWsV7qdO34VNPEBPRTMnaHHgcHuUWP6CBF5bbVsrqClq4iDHPE2VuOxwz9V6lUEREBERAREQEREBERBG9o92+xNC324g7roKSQsP6iMN+JCw/s3oH3G/SNb6792Bv9UjgPllar8p2uNHsorog7Bqp4oPDeyfkqH8nS3+d6utuRlprOld3iOMn5kKrGyqGmZSUkFPEAI4WNjaB1ADAX7r43kvqiCIiAiIgIiICIiD4/Bbg9awptFsklq2l3G3NheS+WRrWMaSS08W4HiFuwhVxtGp46S6Udya1rZGSsJdjjjlz8FKuLp7H5qmXZzYRXxviqYoOhex/rAtJAz2cAFNFFtGzBtTc6bOW9KKhn9Lx++VKUhZoREVQREQEREBERAREQUJ5X1U2LRVqgMjGmSt3t0uwXAN5gd2VB/JYdFLqala1zd9kdQ9w6+pq73lnNBpdK53M79Tz58o+SifkutB11ajgejS1WOvmUqtgjkiIiCIiAiIgIiICIiAoftNgM1gmLR6TWOI8MH6KYLi6ti6WzTA+z3jClWdRfQ9Xv1dqmJ/7qldET2lpyPqrCVQaInLbNZJs5MFeYj7CCFbwUi5dfURFpkREQEREBERAREQUP5Vtvo6+yWcTS1DK6N8ppWtaDE4+hvb/WMDGMKP8Ak06Tfb66gvFVVBzpI6mOGKNvDg7Di4n4YUq8puPeobC/HASTN94b+ybCCPseyD8slY0+8FStSeLuREVZEREBERAQnCFVVtY2s0uj3OoLbEysuxHpAn0Ic8t7tPcgtQlf5bI1xw1zXHuOVhzVm1TWF7c4VNzkjhP8mD7tnwUVpdU3SOXMVdV004dkSwyuaQfZnim1/L+h4K5ep8iw1zhzbGXDw4rNOzHbvc7bWxW7V73V1EcAVWPvWDtP5gOvrWkbvWQVmk6yrpZGS08tI+Rj2nIc0tOCoTqqtFyH/B80meMVwY//AMirtbxwqF0BUec7PbhNjd3qtnD/AHK+Weq32KRrN/sIiLTAiIgIiICIiAiIgqPyjabptNW6T/TqSPe0/suFsNm6Oit7CfUuE0f98YI+SnG3Cl840S52M9FPG738Pqq32VzebMnBODBXwTD2OBaVmtzjRIRfAQvuVpgREQEREHG1hd22LTtdcXEZhjJbnrceA+Kwnqy7y1l1qJZZHSTSPL3uPEkkrVnlG3HzXR9PTA484nye8NGfqsbVjy6OeoycucWhGo+NrYXP3JH4PJKyAR7kreR61whC6Rx9/Bdu2udLapoXcTEctPYFFjqVcX/T4KyLJ3Dk/UeIVx6B2hvs+z+9WKqkdI3ot+gdjOGv9ZvsGeHtVV2qMVGlqne5twQujpGoDKe1zSkBu5JE4u4jAz1eChIvLZjGW7NHAj+LWR496v1owqb0ZTdDoK0MAx01YwkK5RzSJk+oiLTIiIgIiICIiAiIgju0Gj8+0fdIQMkQl49rTn6KjNH5a+4Rs9eWm3h7WODs/NaOrgx1JM2b+G5jg72EKgbREyjvcX5RIYz3tOQs1vBJblfddXGmE9iuOnabLd5tO4GSQjvzyPgoG7bnqzTdW6l1RaqSbDt3po2lgz4L0VhMNRXUlXTxCKIgxyAekc5zx6scOSgV+qI650kU7xVxAmMlx3nD9J7e5PVsi9tEbb7Hf6qKjuMTrZUSndje9+9E89m91HuKtppyAeHgv59VVsltNYYQS6mkjE0D/wA0Z4e8HgtM+TrrqW8UEunrrN0lbRsDqeRxy6SLrB7S35KxizS7URFUUL5Ukrm0VqYDw3Jnf8Vli6N3LNSnh6ZefkFqnyo4XOobS4DgWzN/4rLVw9OwN4jehkIx3H/4o05lEwdGXYXttjd2nr3/AId0BeCklAgcCunC0w2N73DDp5Mj2BUd+0nodKzuI9cYXr07Fv6ftRIzmV7T1esSFzZJhFpUt5E5Xe01uix2WDk980YH9w4rLUaV01Hv2LTVMwEOE+84exWmFDNC0DWkzFp3IRuR56ieamisZy6IiKsiIiAiIgIiICIvJdLhS2ugnrK+ZsNNC0vfI44ACDnazqHwWGoMRIe/DBjvVMV4ZDVvDCGgYwubrjbnTVgkZaqStfStdhsxgd0Z78qH3TWU9dYpq+ysFTNE5nSb7c7o6+HwWLdumM0mG0EvZTCvhGeljDiB1nHEe9VHRvNNTgVDh00rzLMf1O448OQ9itm31sertn7pIRiQMLw3rZnmPBwVFVc0dTUxx1ERbLTyuyMkAnPWO7BXTBnNYc9Iyt0g+VwBktVSyTe7YJfQcPYCWu9q5mgLpJpnXdurGktbT1Qil743HdOfA/BdzTx6XSd+aDky26Th2loDh8lC65xdXySN5yMbJ8AsLeN6NIIBByDyX1cjSVX5/pi01ROTNSxPPt3RlddaYVR5RVudVaQpqpjc+az+lw5NcMfssf3qkmjbOxgzFIc8Oohf0Ivlsp7xaqq31jd6CojMbu7PX4c1jrXWmq3SV3noLhEdwnMUpHoys6iD81FnFQW631NTVNjawhp9Z3UAu5ei3pYqaD1IwGrpyVcdPCWQMDXdoXLp4XSzmR/bkqq/S6Ei1QUw9aRwaPqrJ2Tafk1Hq+10UfowU330jwOTW8fiVXNJBLcrox8Ub3tadyJrQSXE9eO/qWxNiGhn6TsD6i4M3brW4dI3riYPVZ9T3qCxaKljo6dkMLd1jeX7r0IirIiIgIiICIiAiIgHkq125T0jdMRQV7HTwGUSvpmnAlDckB36c8SOvCsoqn9vLXb9tcQTE5rh3EgjI9yVZ1Ql7vP+I6iOnbMynhaQG07eEeO4YBHJWvobZdTiiirIJGxVDm7zZQMtcD+Fw/E08iFE9odosNwZHLahuPc0SgMYGmI4A3c88gglWP5P+pJa3TtTbLi7eqbe/dDz+Nh4g4WW/UZtdkGldXVFDGx0Vury7ER5QSn1mA9Yzgg9jlUO0i0Ms+rKrejcBWROfE4HG5Jn1j28j71ovaW5s15o5IRhzt1xx2sPP+0rP+2K4z3TUVL0IYXQNcQw/iGe1XG6qZex39E8bfUQP49LRTtPf908fRQkHpKeikOQTTMyfBTHRm86WBxaWhtNIXA9X3b+B96hduzNR07RvH0GRjHaeSn1fjaey/eGz+wB/PzRilK5WlqL7P07bKTGOgpo2Ed4aMrqrTmLj6m05a9SW51FeKRlTAeIzzYe1p6iuwigz1qTyd43OfJp+6Z45bDWDAH+5o+i4NF5PF+qJAy4XK3U9Pn0mw7zt728OK1HhMIu1ebPtlNi0e5lQxhrbg3lUTNHof0jqVhAYX1FUEREBERAREQEREBERAUZ1/p8ai09PTMAFSwb8Dux3YpMvhGRhBjip1dLb55bfdZXUFVCcFsjeDvYcclMthzpqmpvFbSt6Vs+AwDhv7vNw96n21PR1BNM+51FLHJA9rjIeiDyyTHAjPUTzVS6E1jRUlcYhWvp66N46OKdjY4+wsaBwx81m+OkrubR9XU1pqopqqQdOxj2xwt4kudwHcMcfgqk6OStucNfJl4qmHeaePROaf8AiR8QVPNrGkWV9ZHd7VHvUtcd5zM5MUwI3m/D5LyWy0ijpGvuW5S08Yy4ynGVZ4l9eI1QtGl7tWA/ePhMEPbvyegMeGSvXsW02+86ntlM6Leggd5zOeprWch4lfjRWW5bQ71FS2Cjf9kUbi7pHDda9/LfJPIY4AeK0ts00VBo6zmLeEtdPh08oHDhya3uCFqYhfURVgREQEREBERAREQEREBERAREQEREBeK5VFXDETRUoqJOoF+6F7UQVxea/aFUtkhpdM2N8D/RPnNaeI7wFArpsWrb1Qvq7xDQU9y3y4MtkjvV7MuGCVoTCYCLLpnK/WuqNC+ijklppRgFsmRkgYBPYe8KM6ZodM0Fe2PaHQXWYh3oVZqXywH+pvMeHuC1DdrPQ3WLdrIWvcOTxwc3xUAvuhaiFrzRbtZARxjcPT93IrLcy31NNJy2KS0x/wCGnURocZApS3A9uOv2ruDlwWcH6Zbbq0z2yWqtFa053qclnHvaVKLRrnVNpDY7lT095px/MjPRzY9nIptLh/F0IoPatpdgrHNjrJZrbOeG5VsLRn+rkphSVlPWRiSlqIpozydG8OHwWmHoRAiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIg8dfbqWvZu1dPHKOreHEeKjNw0PTSZdQzvhd+V/pD91MkQ3ZxVVx0lXxNLZaVlTF2s9L4c1H/sKnpZS6Bk9DL2wvdER4K9CMr8p6eKduJo2PH6m5U03+/wCqmpa7UFGB5re55GDk2pY2Ue84KVN21XVsAqbzBSMBx/k6fDneJzhWPNpy2y/yOjPaw4XCuOmaiMnzRwlZzAOA5TRLEXp7lqSlI6C/CoH5KqEH4j9l3bXq+7iRrLjbIJm/6lLMAf7XLxVthuElPLE6GWPfaW78Yw5uRzHPivNTWuqghhp3RzTPa1rTJIMucR1nhzRdSrLtddDcaOOppiTG/PBwwQRwII6ivWuVpyikoreGzDEj3F7h3n6rqqxz+iIioIiICIiD/9k=</field>
-        </record>
-
-        <record id="product_product_33" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_33-image.jpg"/>
-        </record>
-
-        <record id="product_product_34" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_34-image.jpg"/>
-        </record>
-
-        <record id="product_product_35" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_35-image.jpg"/>
-        </record>
-
-        <record id="product_product_36" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_36-image.jpg"/>
-        </record>
-
-        <record id="product_product_37" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_37-image.jpg"/>
-        </record>
-
-        <record id="product_product_38" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_38-image.jpg"/>
-        </record>
-
-        <record id="product_product_39" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_39-image.jpg"/>
-        </record>
-
-        <record id="product_product_40" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_40-image.jpg"/>
-        </record>
-
-        <record id="product_product_41" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_41-image.jpg"/>
-        </record>
-
-        <record id="product_product_42" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_42-image.jpg"/>
-        </record>
-
-        <record id="product_product_43" model="product.product">
+        <record id="product_order_01" model="product.product">
             <field name="image" type="base64" file="product/static/img/product_product_43-image.jpg"/>
         </record>
 
-        <record id="product_product_44" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_44-image.jpg"/>
+        <record id="product_delivery_02" model="product.product">
+            <field name="image" type="base64" file="product/static/img/product_product_46-image.jpg"/>
         </record>
 
-        <record id="product_product_45" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_45-image.jpg"/>
+        <record id="membership_0" model="product.product">
+            <field name="image" type="base64" file="product/static/img/membership_0-image.jpg"/>
         </record>
 
-        <record id="product_product_46" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_46-image.jpg"/>
+        <record id="membership_1" model="product.product">
+            <field name="image" type="base64" file="product/static/img/membership_1-image.jpg"/>
         </record>
 
-        <record id="product_product_47" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_47-image.jpg"/>
+        <record id="membership_2" model="product.product">
+            <field name="image" type="base64" file="product/static/img/membership_2-image.jpg"/>
         </record>
 
-        <!--record id="product_product_48" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_48-image.jpg"/>
-        </record-->
-
     </data>
 </openerp>
diff --git a/addons/product/product_pricelist_demo.yml b/addons/product/product_pricelist_demo.yml
index 583eb806887..19b1a237d42 100644
--- a/addons/product/product_pricelist_demo.yml
+++ b/addons/product/product_pricelist_demo.yml
@@ -20,13 +20,13 @@
       - name: 1 surchange on Laptop
         applied_on : '1_product'
         sequence: 1
-        product_id: product_product_25
+        product_id: product_delivery_01
         compute_price: 'formula'
         base: 'list_price'
         price_surcharge: 1
       - name: 5% Discount on all Computer related products
         applied_on : '2_product_category'
-        sequence: 1
+        sequence: 4
         min_quantity: 2
         compute_price: 'formula'
         base: 'list_price'
diff --git a/addons/membership/static/img/membership_0-image.jpg b/addons/product/static/img/membership_0-image.jpg
index f9723384f8b..f9723384f8b 100644
--- a/addons/membership/static/img/membership_0-image.jpg
+++ b/addons/product/static/img/membership_0-image.jpg
diff --git a/addons/membership/static/img/membership_1-image.jpg b/addons/product/static/img/membership_1-image.jpg
index ade87446afb..ade87446afb 100644
--- a/addons/membership/static/img/membership_1-image.jpg
+++ b/addons/product/static/img/membership_1-image.jpg
diff --git a/addons/membership/static/img/membership_2-image.jpg b/addons/product/static/img/membership_2-image.jpg
index ed6f4118417..ed6f4118417 100644
--- a/addons/membership/static/img/membership_2-image.jpg
+++ b/addons/product/static/img/membership_2-image.jpg
diff --git a/addons/product/static/img/product_product_14-image.jpg b/addons/product/static/img/product_product_14-image.jpg
deleted file mode 100644
index 98e9f5e7851..00000000000
--- a/addons/product/static/img/product_product_14-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_15-image.jpg b/addons/product/static/img/product_product_15-image.jpg
deleted file mode 100644
index 98e9f5e7851..00000000000
--- a/addons/product/static/img/product_product_15-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_18-image.jpg b/addons/product/static/img/product_product_18-image.jpg
deleted file mode 100644
index 95eed34fcbe..00000000000
--- a/addons/product/static/img/product_product_18-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_19-image.jpg b/addons/product/static/img/product_product_19-image.jpg
deleted file mode 100644
index 8704982173a..00000000000
--- a/addons/product/static/img/product_product_19-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_21-image.jpg b/addons/product/static/img/product_product_21-image.jpg
deleted file mode 100644
index 5989039c922..00000000000
--- a/addons/product/static/img/product_product_21-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_23-image.jpg b/addons/product/static/img/product_product_23-image.jpg
deleted file mode 100644
index dbbae134da7..00000000000
--- a/addons/product/static/img/product_product_23-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_26-image.jpg b/addons/product/static/img/product_product_26-image.jpg
deleted file mode 100644
index 919d29fc1e3..00000000000
--- a/addons/product/static/img/product_product_26-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_28-image.jpg b/addons/product/static/img/product_product_28-image.jpg
deleted file mode 100644
index e7444d34a59..00000000000
--- a/addons/product/static/img/product_product_28-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_29-image.jpg b/addons/product/static/img/product_product_29-image.jpg
deleted file mode 100644
index 171b9067280..00000000000
--- a/addons/product/static/img/product_product_29-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_30-image.jpg b/addons/product/static/img/product_product_30-image.jpg
deleted file mode 100644
index 3a1b3db54d9..00000000000
--- a/addons/product/static/img/product_product_30-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_31-image.jpg b/addons/product/static/img/product_product_31-image.jpg
deleted file mode 100644
index 707767ab325..00000000000
--- a/addons/product/static/img/product_product_31-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_33-image.jpg b/addons/product/static/img/product_product_33-image.jpg
deleted file mode 100644
index f1153fba043..00000000000
--- a/addons/product/static/img/product_product_33-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_34-image.jpg b/addons/product/static/img/product_product_34-image.jpg
deleted file mode 100644
index d9c8a15d872..00000000000
--- a/addons/product/static/img/product_product_34-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_35-image.jpg b/addons/product/static/img/product_product_35-image.jpg
deleted file mode 100644
index 90b8631a1a1..00000000000
--- a/addons/product/static/img/product_product_35-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_36-image.jpg b/addons/product/static/img/product_product_36-image.jpg
deleted file mode 100644
index d86457e81c7..00000000000
--- a/addons/product/static/img/product_product_36-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_37-image.jpg b/addons/product/static/img/product_product_37-image.jpg
deleted file mode 100644
index 01c52a1eb18..00000000000
--- a/addons/product/static/img/product_product_37-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_38-image.jpg b/addons/product/static/img/product_product_38-image.jpg
deleted file mode 100644
index 0b775760bab..00000000000
--- a/addons/product/static/img/product_product_38-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_39-image.jpg b/addons/product/static/img/product_product_39-image.jpg
deleted file mode 100644
index a971b97216d..00000000000
--- a/addons/product/static/img/product_product_39-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_40-image.jpg b/addons/product/static/img/product_product_40-image.jpg
deleted file mode 100644
index 739ecdec4f8..00000000000
--- a/addons/product/static/img/product_product_40-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_41-image.jpg b/addons/product/static/img/product_product_41-image.jpg
deleted file mode 100644
index 8d8a3959f42..00000000000
--- a/addons/product/static/img/product_product_41-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_42-image.jpg b/addons/product/static/img/product_product_42-image.jpg
deleted file mode 100644
index b2d57463ac1..00000000000
--- a/addons/product/static/img/product_product_42-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_44-image.jpg b/addons/product/static/img/product_product_44-image.jpg
deleted file mode 100644
index 290cbe547a5..00000000000
--- a/addons/product/static/img/product_product_44-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_45-image.jpg b/addons/product/static/img/product_product_45-image.jpg
deleted file mode 100644
index c5357b03571..00000000000
--- a/addons/product/static/img/product_product_45-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_47-image.jpg b/addons/product/static/img/product_product_47-image.jpg
deleted file mode 100644
index 9fda398ba56..00000000000
--- a/addons/product/static/img/product_product_47-image.jpg
+++ /dev/null
diff --git a/addons/product/static/img/product_product_48-image.jpg b/addons/product/static/img/product_product_48-image.jpg
deleted file mode 100644
index 60ed049df88..00000000000
--- a/addons/product/static/img/product_product_48-image.jpg
+++ /dev/null
diff --git a/addons/product/test/product_pricelist.yml b/addons/product/test/product_pricelist.yml
index a95a56f23f6..08d26fdbba7 100644
--- a/addons/product/test/product_pricelist.yml
+++ b/addons/product/test/product_pricelist.yml
@@ -13,7 +13,7 @@
 -
   !python {model: product.product}: |
     from openerp.tools import float_compare
-    product = self.browse(cr, uid, ref("product_product_25"), context=context)
+    product = self.browse(cr, uid, ref("product_delivery_01"), context=context)
     assert float_compare(product.price, product.lst_price + 1, precision_digits=2) == 0, "Wrong sale price: Laptop."
 -
   I check sale price of IT component.
@@ -28,7 +28,7 @@
   !python {model: product.product}: |
     from openerp.tools import float_compare
     context.update({'quantity':5})
-    product = self.browse(cr, uid, ref("product_product_26"), context=context)
+    product = self.browse(cr, uid, ref("product_product_25"), context=context)
     assert float_compare(product.price, product.lst_price-product.lst_price*(0.05), precision_digits=2) == 0, "Wrong sale price: IT component if more than 3 Unit."
 -
   I check sale price of LCD Monitor.
diff --git a/addons/product/tests/test_pricelist.py b/addons/product/tests/test_pricelist.py
index 3e9cd7ee3c8..1aa3c6d8c9e 100644
--- a/addons/product/tests/test_pricelist.py
+++ b/addons/product/tests/test_pricelist.py
@@ -11,8 +11,8 @@ class TestPricelist(TransactionCase):
         self.product_pricelist = self.registry('product.pricelist')
         self.uom = self.registry('product.uom')
 
-        self.usb_adapter_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_product_48')[1]
-        self.datacard_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_product_46')[1]
+        self.usb_adapter_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_delivery_01')[1]
+        self.datacard_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_delivery_02')[1]
         self.unit_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_uom_unit')[1]
         self.dozen_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_uom_dozen')[1]
         self.tonne_id = self.ir_model_data.xmlid_to_res_id(cr, uid, 'product.product_uom_ton')
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index da6578d61e8..d2154ba48b4 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -10,23 +10,11 @@
             <field eval="1.0" name="po_lead"/>
         </record>
 
-        <record id="product.product_product_48" model="product.product">
+        <record id="product.product_delivery_01" model="product.product">
             <field name="route_ids" eval="[(4,ref('route_warehouse0_buy'))]"></field>
         </record>
 
-        <record id="product.product_product_36" model="product.product">
-            <field name="route_ids" eval="[(4,ref('route_warehouse0_buy'))]"></field>
-        </record>
-
-        <record id="product.product_product_28" model="product.product">
-            <field name="route_ids" eval="[(4,ref('route_warehouse0_buy'))]"></field>
-        </record>
-
-        <record id="product.product_product_46" model="product.product">
-            <field name="route_ids" eval="[(4,ref('route_warehouse0_buy'))]"></field>
-        </record>
-
-        <record id="product.product_product_23" model="product.product">
+        <record id="product.product_delivery_02" model="product.product">
             <field name="route_ids" eval="[(4,ref('route_warehouse0_buy'))]"></field>
         </record>
 
diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml
index f96d33b7593..8b7ed7c44b5 100644
--- a/addons/purchase/purchase_order_demo.yml
+++ b/addons/purchase/purchase_order_demo.yml
@@ -6,7 +6,7 @@
 -
   !record {model: purchase.order.line, id: purchase_order_line_1}:
     order_id: purchase.purchase_order_1
-    product_id: product.product_product_15
+    product_id: product.product_delivery_01
     name: RAM SR3
     price_unit: 79.80
     product_qty: 15.0
@@ -36,13 +36,13 @@
   !record {model: purchase.order, id: purchase_order_2}:
     partner_id: base.res_partner_3
     order_line:
-      - product_id: product.product_product_31
+      - product_id: product.product_delivery_02
         name: Multimedia Speakers
         price_unit: 132.50
         product_qty: 20.0
         product_uom: product.product_uom_unit
         date_planned: !eval time.strftime('%Y-%m-%d')
-      - product_id: product.product_product_29
+      - product_id: product.product_delivery_01
         name: Pen drive, SP-2
         price_unit: 89
         product_qty: 5
@@ -64,7 +64,7 @@
   !record {model: purchase.order, id: purchase_order_4}:
     partner_id: base.res_partner_4
     order_line:
-      - product_id: product.product_product_14
+      - product_id: product.product_delivery_02
         name: RAM SR2 (kit)
         price_unit: 85.50
         product_qty: 6.0
@@ -104,19 +104,19 @@
   !record {model: purchase.order, id: purchase_order_6}:
     partner_id: base.res_partner_1
     order_line:
-      - product_id: product.product_product_38
+      - product_id: product.product_delivery_02
         name: Ink Cartridge
         price_unit: 58
         product_qty: 9
         product_uom: product.product_uom_unit
         date_planned: !eval time.strftime('%Y-%m-%d')
-      - product_id: product.product_product_39
+      - product_id: product.product_delivery_01
         name: Toner Cartridge
         product_qty: 3
         price_unit: 65
         product_uom: product.product_uom_unit
         date_planned: !eval time.strftime('%Y-%m-%d')
-      - product_id: product.product_product_44
+      - product_id: product.consu_delivery_01
         name: GrapWorks Software
         product_qty: 4
         price_unit: 154.5
@@ -133,7 +133,7 @@
         price_unit: 13.5
         product_uom: product.product_uom_unit
         date_planned: !eval time.strftime('%Y-%m-%d')
-      - product_id: product.product_product_34
+      - product_id: product.product_delivery_02
         name: Webcam
         product_qty: 15
         price_unit: 38.0
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index a4889496e1c..9d307e75b14 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -32,7 +32,7 @@
         <record id="sale_order_line_2" model="sale.order.line">
             <field name="order_id" ref="sale_order_1"/>
             <field name="name">Pen drive, 16GB</field>
-            <field name="product_id" ref="product.product_product_30"/>
+            <field name="product_id" ref="product.product_delivery_02"/>
             <field name="product_uom_qty">5</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">145.00</field>
@@ -41,7 +41,7 @@
         <record id="sale_order_line_3" model="sale.order.line">
             <field name="order_id" ref="sale_order_1"/>
             <field name="name">Headset USB</field>
-            <field name="product_id" ref="product.product_product_33"/>
+            <field name="product_id" ref="product.product_delivery_01"/>
             <field name="product_uom_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">65.00</field>
@@ -96,7 +96,7 @@
         <record id="sale_order_line_7" model="sale.order.line">
             <field name="order_id" ref="sale_order_3"/>
             <field name="name">Toner Cartridge</field>
-            <field name="product_id" ref="product.product_product_39"/>
+            <field name="product_id" ref="product.product_delivery_01"/>
             <field name="product_uom_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">70.00</field>
@@ -123,7 +123,7 @@
         <record id="sale_order_line_9" model="sale.order.line">
             <field name="order_id" ref="sale_order_4"/>
             <field name="name">Webcam</field>
-            <field name="product_id" ref="product.product_product_34"/>
+            <field name="product_id" ref="product.product_delivery_02"/>
             <field name="product_uom_qty">10</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">45.00</field>
@@ -132,7 +132,7 @@
         <record id="sale_order_line_10" model="sale.order.line">
             <field name="order_id" ref="sale_order_4"/>
             <field name="name">Multimedia Speakers</field>
-            <field name="product_id" ref="product.product_product_31"/>
+            <field name="product_id" ref="product.consu_delivery_02"/>
             <field name="product_uom_qty">3</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">150.00</field>
@@ -141,7 +141,7 @@
         <record id="sale_order_line_11" model="sale.order.line">
             <field name="order_id" ref="sale_order_4"/>
             <field name="name">Switch, 24 ports</field>
-            <field name="product_id" ref="product.product_product_47"/>
+            <field name="product_id" ref="product.product_delivery_01"/>
             <field name="product_uom_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">70.00</field>
@@ -160,30 +160,12 @@
         <record id="sale_order_line_12" model="sale.order.line">
             <field name="order_id" ref="sale_order_5"/>
             <field name="name">External Hard disk</field>
-            <field name="product_id" ref="product.product_product_28"/>
+            <field name="product_id" ref="product.product_delivery_02"/>
             <field name="product_uom_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">405.00</field>
         </record>
 
-        <record id="sale_order_line_13" model="sale.order.line">
-            <field name="order_id" ref="sale_order_5"/>
-            <field name="name">Blank DVD-RW</field>
-            <field name="product_id" ref="product.product_product_36"/>
-            <field name="product_uom_qty">3</field>
-            <field name="product_uom" ref="product.product_uom_dozen"/>
-            <field name="price_unit">24.00</field>
-        </record>
-
-        <record id="sale_order_line_14" model="sale.order.line">
-            <field name="order_id" ref="sale_order_5"/>
-            <field name="name">Printer, All-in-one</field>
-            <field name="product_id" ref="product.product_product_37"/>
-            <field name="product_uom_qty">1</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">4410.00</field>
-        </record>
-
         <record id="sale_order_6" model="sale.order">
             <field name="partner_id" ref="base.res_partner_18"/>
             <field name="partner_invoice_id" ref="base.res_partner_18"/>
@@ -225,7 +207,7 @@
         <record id="sale_order_line_17" model="sale.order.line">
             <field name="order_id" ref="sale_order_7"/>
             <field name="name">GrapWorks Software</field>
-            <field name="product_id" ref="product.product_product_44"/>
+            <field name="product_id" ref="product.consu_delivery_01"/>
             <field name="product_uom_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">173.00</field>
@@ -234,7 +216,7 @@
         <record id="sale_order_line_18" model="sale.order.line">
             <field name="order_id" ref="sale_order_7"/>
             <field name="name">Datacard</field>
-            <field name="product_id" ref="product.product_product_46"/>
+            <field name="product_id" ref="product.product_delivery_02"/>
             <field name="product_uom_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">40.00</field>
@@ -243,7 +225,7 @@
         <record id="sale_order_line_19" model="sale.order.line">
             <field name="order_id" ref="sale_order_7"/>
             <field name="name">USB Adapter</field>
-            <field name="product_id" ref="product.product_product_48"/>
+            <field name="product_id" ref="product.product_delivery_01"/>
             <field name="product_uom_qty">1</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">18.00</field>
diff --git a/addons/sale/sale_demo.yml b/addons/sale/sale_demo.yml
index c176dd59fbf..1e31d88448b 100644
--- a/addons/sale/sale_demo.yml
+++ b/addons/sale/sale_demo.yml
@@ -32,8 +32,8 @@
           self._update(cr, uid, 'account.invoice', 'sale', vals, 'test_crm_sale_invoice_2')
           if account_sale_id:
               vals = {
-                  'name': 'Basic computer with Dvorak keyboard and left-handed mouse',
-                  'product_id': ref('product.product_product_57'),
+                  'name': '',
+                  'product_id': ref('product.consu_delivery_03'),
                   'invoice_id': ref('test_crm_sale_invoice_1'),
                   'price_unit': 250,
                   'quantity': 1,
@@ -41,8 +41,8 @@
               }
               self._update(cr, uid, 'account.invoice.line', 'sale', vals, 'test_crm_sale_invoice_1_line_1')
               vals = {
-                  'name': 'Little server with raid 1 and 512ECC ram',
-                  'product_id': ref('product.product_product_58'),
+                  'name': '',
+                  'product_id': ref('product.consu_delivery_02'),
                   'invoice_id': ref('test_crm_sale_invoice_1'),
                   'price_unit': 800,
                   'quantity': 2,
@@ -50,8 +50,8 @@
               }
               self._update(cr, uid, 'account.invoice.line', 'sale', vals, 'test_crm_sale_invoice_1_line_2')
               vals = {
-                  'name': 'Server with raid 10 and 2048ECC ram',
-                  'product_id': ref('product.product_product_59'),
+                  'name': '',
+                  'product_id': ref('product.consu_delivery_01'),
                   'invoice_id': ref('test_crm_sale_invoice_1'),
                   'price_unit': 4800,
                   'quantity': 4,
@@ -59,8 +59,8 @@
               }
               self._update(cr, uid, 'account.invoice.line', 'sale', vals, 'test_crm_sale_invoice_1_line_3')
               vals = {
-                  'name': 'Basic formation with Dvorak',
-                  'product_id': ref('product.product_product_53'),
+                  'name': '',
+                  'product_id': ref('product.consu_delivery_01'),
                   'invoice_id': ref('test_crm_sale_invoice_2'),
                   'price_unit': 500,
                   'quantity': 1,
diff --git a/addons/sale/sale_product_demo.xml b/addons/sale/sale_product_demo.xml
index 43ffa55a7d6..c7287431017 100644
--- a/addons/sale/sale_product_demo.xml
+++ b/addons/sale/sale_product_demo.xml
@@ -1,131 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="product.product_product_59" model="product.product">
+        <record id="product.consu_delivery_01" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_58" model="product.product">
+        <record id="product.consu_delivery_02" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_57" model="product.product">
+        <record id="product.consu_delivery_03" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_56" model="product.product">
+        <record id="product.service_delivery" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_55" model="product.product">
+        <record id="product.product_delivery_01" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_54" model="product.product">
+        <record id="product.product_delivery_02" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_53" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_52" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_51" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_50" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_49" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_48" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_47" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_46" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_45" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_44" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_43" model="product.product">
+        <record id="product.product_order_01" model="product.product">
             <field name="invoice_policy">order</field>
         </record>
 
-        <record id="product.product_product_42" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_41" model="product.product">
+        <record id="product.product_delivery_02" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_40" model="product.product">
+        <record id="product.product_delivery_01" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_39" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_38" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_37" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_36" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_35" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_34" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_33" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_32" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_31" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_30" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_29" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_28" model="product.product">
+        <record id="product.product_delivery_02" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
@@ -133,10 +45,6 @@
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_26" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
         <record id="product.product_product_25" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
@@ -145,30 +53,14 @@
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_23" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
         <record id="product.product_product_22" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_21" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
         <record id="product.product_product_20" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_19" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_18" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
         <record id="product.product_product_17" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
@@ -177,14 +69,6 @@
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_15" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
-        <record id="product.product_product_14" model="product.product">
-            <field name="invoice_policy">delivery</field>
-        </record>
-
         <record id="product.product_product_13" model="product.product">
             <field name="invoice_policy">delivery</field>
         </record>
@@ -261,11 +145,11 @@
             <field name="invoice_policy">delivery</field>
         </record>
 
-        <record id="product.product_product_1b" model="product.product">
+        <record id="product.service_cost_01" model="product.product">
             <field name="invoice_policy">cost</field>
         </record>
 
-        <record id="product.product_product_0" model="product.product">
+        <record id="product.service_order_01" model="product.product">
             <field name="invoice_policy">order</field>
         </record>
 
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 2bc80d8853f..903bd3d9395 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -20,8 +20,8 @@
         </record>
         <record id="test_order_1_line_3" model="sale.order.line">
             <field name="order_id" ref="test_order_1"/>
-            <field name="name">[HDD-SH2] HDD SH-2</field>
-            <field name="product_id" ref="product.product_product_18"/>
+            <field name="name">Switch, 24 ports</field>
+            <field name="product_id" ref="product.product_delivery_01"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">90</field>
             <field name="product_uom_qty">3</field>
diff --git a/addons/sale/tests/test_sale_common.py b/addons/sale/tests/test_sale_common.py
index a7144af6d57..fea031a4308 100644
--- a/addons/sale/tests/test_sale_common.py
+++ b/addons/sale/tests/test_sale_common.py
@@ -29,10 +29,10 @@ class TestSale(AccountingTestCase):
         })
         # create quotation with differend kinds of products (all possible combinations)
         self.products = {
-            'prod_order': self.env.ref('product.product_product_43'),
-            'prod_del': self.env.ref('product.product_product_47'),
-            'serv_order': self.env.ref('product.product_product_0'),
-            'serv_del': self.env.ref('product.product_product_56'),
+            'prod_order': self.env.ref('product.product_order_01'),
+            'prod_del': self.env.ref('product.product_delivery_01'),
+            'serv_order': self.env.ref('product.service_order_01'),
+            'serv_del': self.env.ref('product.service_delivery'),
         }
 
         self.partner = self.env.ref('base.res_partner_1')
diff --git a/addons/sale/tests/test_sale_order.py b/addons/sale/tests/test_sale_order.py
index f9effb697e3..af5ffecca9b 100644
--- a/addons/sale/tests/test_sale_order.py
+++ b/addons/sale/tests/test_sale_order.py
@@ -103,7 +103,7 @@ class TestSaleOrder(TestSale):
 
     def test_cost_invoicing(self):
         """ Test confirming a vendor invoice to reinvoice cost on the so """
-        serv_cost = self.env.ref('product.product_product_1b')
+        serv_cost = self.env.ref('product.service_cost_01')
         prod_gap = self.env.ref('product.product_product_1')
         so = self.env['sale.order'].create({
             'partner_id': self.partner.id,
diff --git a/addons/sale_margin/data/sale_margin_demo.xml b/addons/sale_margin/data/sale_margin_demo.xml
index 8c1a96535a4..1a4e6d698e1 100644
--- a/addons/sale_margin/data/sale_margin_demo.xml
+++ b/addons/sale_margin/data/sale_margin_demo.xml
@@ -18,14 +18,6 @@
             <field name="purchase_price">390.00</field>
         </record>
 
-        <record id="sale.sale_order_line_13" model="sale.order.line">
-            <field name="purchase_price">21.60</field>
-        </record>
-
-        <record id="sale.sale_order_line_14" model="sale.order.line">
-            <field name="purchase_price">4258.00</field>
-        </record>
-
         <record id="sale.sale_order_line_16" model="sale.order.line">
             <field name="purchase_price">2870.00</field>
         </record>
diff --git a/addons/sale_mrp/test/cancellation_propagated.yml b/addons/sale_mrp/test/cancellation_propagated.yml
index 84b795b1d32..aebeecd922f 100644
--- a/addons/sale_mrp/test/cancellation_propagated.yml
+++ b/addons/sale_mrp/test/cancellation_propagated.yml
@@ -26,7 +26,7 @@
     product_qty: 1.0
     type: normal
     bom_line_ids:
-      - product_id: product.product_product_44
+      - product_id: product.consu_delivery_01
         product_uom: product.product_uom_unit
         product_qty: 1.0
 -
@@ -54,7 +54,7 @@
   Confirm sales order
 - 
   !python {model: sale.order}: |
-    self.action_confirm(cr, uid, ref("sale_order_product_manu"), context=context)
+    self.action_confirm(cr, uid, [ref("sale_order_product_manu")], context=context)
 -
   I run scheduler.
 -
diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml
index faa3b1a3e9a..881b84d0e31 100644
--- a/addons/sale_mrp/test/sale_mrp.yml
+++ b/addons/sale_mrp/test/sale_mrp.yml
@@ -80,7 +80,7 @@
   I confirm the sale order
 -
   !python {model: sale.order}: |
-    self.action_confirm(cr, uid, ref("sale_order_so0"), context=context)
+    self.action_confirm(cr, uid, [ref("sale_order_so0")], context=context)
 -
   I verify that a procurement has been generated for sale order
 -
diff --git a/addons/sale_mrp/tests/test_move_explode.py b/addons/sale_mrp/tests/test_move_explode.py
index a7e3bdea946..ffdc857ce64 100644
--- a/addons/sale_mrp/tests/test_move_explode.py
+++ b/addons/sale_mrp/tests/test_move_explode.py
@@ -15,25 +15,31 @@ class TestMoveExplode(common.TransactionCase):
         self.Product = self.env['product.product']
 
         #product that has a phantom bom
-        self.product_bom = self.env.ref('product.product_product_3')
+        self.product_bom = self.env.ref('product.product_product_5')
         #bom with that product
-        self.bom = self.env.ref('mrp.mrp_bom_9')
+        self.bom = self.env.ref('mrp.mrp_bom_kit')
         #partner agrolait
         self.partner = self.env.ref('base.res_partner_1')
-        #bom: PC Assemble (with property: DDR 512MB)
-        self.bom_prop = self.env.ref('mrp.mrp_bom_property_0')
+        #bom:  (with property: DDR 512MB)
+        self.bom_prop = self.env.ref('mrp.mrp_bom_manufacture')
+        self.bom_prop.write({'property_ids': [(6,0,[self.env['ir.model.data'].xmlid_to_res_id('mrp.mrp_property_8')])]})
 
         self.template = self.env.ref('product.product_product_3_product_template')
-        #property: DDR 512MB
-        self.mrp_property = self.env.ref('mrp.mrp_property_0')
-        #product: RAM SR2
-        self.product_bom_prop = self.env.ref('product.product_product_14')
-        #phantom bom for RAM SR2 with three lines containing properties
-        self.bom_prop_line = self.env.ref('mrp.mrp_bom_property_line')
-        #product: iPod included in the phantom bom
-        self.product_A = self.env.ref('product.product_product_11')
-        #product: Mouse, Wireless included in the phantom bom
-        self.product_B = self.env.ref('product.product_product_12')
+        self.mrp_property = self.env.ref('mrp.mrp_property_8')
+        self.product_bom_prop = self.env.ref('product.product_product_5')
+        #phantom bom for 17 with seven lines containing properties
+        self.bom_prop_line = self.env.ref('mrp.mrp_bom_kit')
+        # write different properties on the bom and on 2 bom lines
+        self.bom_prop_line.write({'property_ids': [(6,0,[self.env['ir.model.data'].xmlid_to_res_id('mrp.mrp_property_0')])], 'product_id': self.env['ir.model.data'].xmlid_to_res_id('product.product_product_5')})
+        #product: Motherboard included in the phantom bom
+        self.product_A = self.env.ref('product.product_product_20')
+        #product: 24 Graphic card in the phantom bom
+        self.product_B = self.env.ref('product.product_product_24')
+        for bom_line in self.bom_prop_line.bom_line_ids:
+            if bom_line.product_id.id in [self.env.ref('product.product_product_20').id, self.env.ref('product.product_product_24').id]:
+                bom_line.write({'property_ids': [(6, 0, [self.env['ir.model.data'].xmlid_to_res_id('mrp.mrp_property_8')])]})
+            else:
+                bom_line.write({'property_ids': [(6, 0, [self.env['ir.model.data'].xmlid_to_res_id('mrp.mrp_property_0')])]})
         #pricelist
         self.pricelist = self.env.ref('product.list0')
 
@@ -41,28 +47,25 @@ class TestMoveExplode(common.TransactionCase):
     def test_00_sale_move_explode(self):
         """check that when creating a sale order with a product that has a phantom BoM, move explode into content of the
             BoM"""
-        #create sale order with one sale order line containing product with a phantom bom
+        # Remove properties on the bom an on the bom lines
+        self.bom.write({'property_ids': [(6,0,[])]})
+        for line in self.bom.bom_line_ids:
+            line.write({'property_ids': [(6,0,[])]})
+        # Create sale order with one sale order line containing product with a phantom bom
         so_vals = {
             'partner_id': self.partner.id,
             'partner_invoice_id': self.partner.id,
             'partner_shipping_id': self.partner.id,
+            'order_line': [(0, 0, {'name': self.product_bom.name, 'product_id': self.product_bom.id, 'product_uom_qty': 1, 'product_uom': self.product_bom.uom_id.id})],
             'pricelist_id': self.pricelist.id,
         }
         self.so = self.SaleOrder.create(vals=so_vals)
-        sol_vals = {
-            'order_id': self.so.id,
-            'name': self.product_bom.name,
-            'product_id': self.product_bom.id,
-            'product_uom': self.product_bom.uom_id.id,
-            'product_uom_qty': 1.0,
-        }
-        self.SaleOrderLine.create(values=sol_vals)
         #confirm sale order
         self.so.action_confirm()
         #get all move associated to that sale_order
         move_ids = self.so.picking_ids.mapped('move_lines').ids
         #we should have same amount of move as the component in the phatom bom
-        bom_component_length = self.MrpBom._bom_explode(self.bom, self.product_bom, 1.0, [])
+        bom_component_length = self.MrpBom._bom_explode(self.bom, self.product_bom, 1.0, properties=[])
         self.assertEqual(len(move_ids), len(bom_component_length[0]))
 
     def test_00_bom_find(self):
diff --git a/addons/sale_mrp/tests/test_sale_mrp_flow.py b/addons/sale_mrp/tests/test_sale_mrp_flow.py
index 1404f1c10cb..15a5c96c851 100644
--- a/addons/sale_mrp/tests/test_sale_mrp_flow.py
+++ b/addons/sale_mrp/tests/test_sale_mrp_flow.py
@@ -341,7 +341,7 @@ class TestSaleMrpFlow(common.TransactionCase):
         """ Test delivered quantity on SO based on delivered quantity in pickings."""
         # intial so
         self.partner = self.env.ref('base.res_partner_1')
-        self.product = self.env.ref('product.product_product_3')
+        self.product = self.env.ref('product.product_product_5')
         so_vals = {
             'partner_id': self.partner.id,
             'partner_invoice_id': self.partner.id,
diff --git a/addons/sale_service/tests/test_sale_service.py b/addons/sale_service/tests/test_sale_service.py
index 4d06312c84e..e906d94c3f7 100644
--- a/addons/sale_service/tests/test_sale_service.py
+++ b/addons/sale_service/tests/test_sale_service.py
@@ -24,7 +24,6 @@ class TestSaleService(TestSale):
         task = project.task_ids.filtered(lambda t: t.name == '%s:%s' % (so.name, prod_task.name))
         self.assertTrue(task, 'Sale Service: task is not created')
         self.assertEqual(task.partner_id, so.partner_id, 'Sale Service: customer should be the same on task and on SO')
-
         # register timesheet on task
         self.env['account.analytic.line'].create({
             'name': 'Test Line',
diff --git a/addons/sale_stock/tests/test_sale_stock.py b/addons/sale_stock/tests/test_sale_stock.py
index 95874b67d7b..b70a6ff508f 100644
--- a/addons/sale_stock/tests/test_sale_stock.py
+++ b/addons/sale_stock/tests/test_sale_stock.py
@@ -55,7 +55,8 @@ class TestSaleStock(TestSale):
         del_qties = [sol.qty_delivered for sol in self.so.order_line]
         del_qties_truth = [2.0 if sol.product_id.type in ['product', 'consu'] else 0.0 for sol in self.so.order_line]
         self.assertEqual(del_qties, del_qties_truth, 'Sale Stock: delivered quantities are wrong after complete delivery')
-        # invoice on delivery
+        # Without timesheet, we manually set the delivered qty for the product serv_del
+        self.so.order_line[1]['qty_delivered'] = 2.0
         inv_id = self.so.action_invoice_create()
         self.assertEqual(self.so.invoice_status, 'invoiced',
                          'Sale Stock: so invoice_status should be "fully invoiced" after complete delivery and invoicing')
@@ -111,7 +112,7 @@ class TestSaleStock(TestSale):
         """
         # intial so
         self.partner = self.env.ref('base.res_partner_1')
-        self.product = self.env.ref('product.product_product_47')
+        self.product = self.env.ref('product.product_delivery_01')
         so_vals = {
             'partner_id': self.partner.id,
             'partner_invoice_id': self.partner.id,
diff --git a/addons/sale_timesheet/data/sale_timesheet_demo.xml b/addons/sale_timesheet/data/sale_timesheet_demo.xml
index 9e9c2603f72..4544c8f50de 100644
--- a/addons/sale_timesheet/data/sale_timesheet_demo.xml
+++ b/addons/sale_timesheet/data/sale_timesheet_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="product.product_product_0" model="product.product">
+        <record id="product.service_order_01" model="product.product">
             <field name="track_service">timesheet</field>
         </record>
         <record id="product.product_product_2" model="product.product">
diff --git a/addons/sale_timesheet/tests/test_sale_timesheet.py b/addons/sale_timesheet/tests/test_sale_timesheet.py
index 78f676bce9b..67f270d8969 100644
--- a/addons/sale_timesheet/tests/test_sale_timesheet.py
+++ b/addons/sale_timesheet/tests/test_sale_timesheet.py
@@ -9,7 +9,7 @@ class TestSaleTimesheet(TestSale):
     def test_timesheet_order(self):
         """ Test timesheet invoicing with 'invoice on order' timetracked products """
         # intial so
-        prod_ts = self.env.ref('product.product_product_0')
+        prod_ts = self.env.ref('product.service_order_01')
         so_vals = {
             'partner_id': self.partner.id,
             'partner_invoice_id': self.partner.id,
diff --git a/addons/stock/procurement_demo.xml b/addons/stock/procurement_demo.xml
index 26fbc813e0b..0e4cc5cdd13 100644
--- a/addons/stock/procurement_demo.xml
+++ b/addons/stock/procurement_demo.xml
@@ -50,14 +50,6 @@
             <field name="type">product</field>
         </record>
 
-        <record id="product.product_product_14" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_15" model="product.product">
-            <field name="type">product</field>
-        </record>
-
         <record id="product.product_product_16" model="product.product">
             <field name="type">product</field>
         </record>
@@ -66,30 +58,14 @@
             <field name="type">product</field>
         </record>
 
-        <record id="product.product_product_18" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_19" model="product.product">
-            <field name="type">product</field>
-        </record>
-
         <record id="product.product_product_20" model="product.product">
             <field name="type">product</field>
         </record>
 
-        <record id="product.product_product_21" model="product.product">
-            <field name="type">product</field>
-        </record>
-
         <record id="product.product_product_22" model="product.product">
             <field name="type">product</field>
         </record>
 
-        <record id="product.product_product_23" model="product.product">
-            <field name="type">product</field>
-        </record>
-
         <record id="product.product_product_24" model="product.product">
             <field name="type">product</field>
         </record>
@@ -98,76 +74,15 @@
             <field name="type">product</field>
         </record>
 
-        <record id="product.product_product_26" model="product.product">
-            <field name="type">product</field>
-        </record>
-
         <record id="product.product_product_27" model="product.product">
             <field name="type">product</field>
         </record>
 
-        <record id="product.product_product_28" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_29" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_30" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_31" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_32" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_33" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_34" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_35" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_36" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_37" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_38" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_39" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-
-        <record id="product.product_product_45" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_46" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_47" model="product.product">
+        <record id="product.product_delivery_02" model="product.product">
             <field name="type">product</field>
         </record>
 
-        <record id="product.product_product_48" model="product.product">
+        <record id="product.product_delivery_01" model="product.product">
             <field name="type">product</field>
         </record>
 
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 50ac06887b6..cd8d723dc02 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -101,20 +101,6 @@
             <field name="product_qty">26.0</field>
             <field name="location_id" ref="stock_location_components"/>
         </record>
-        <record id="stock_inventory_line_7" model="stock.inventory.line">
-            <field name="product_id" ref="product.product_product_14"/>
-            <field name="product_uom_id" ref="product.product_uom_unit"/>
-            <field name="inventory_id" ref="stock_inventory_0"/>
-            <field name="product_qty">32.0</field>
-            <field name="location_id" ref="stock_location_components"/>
-        </record>
-        <record id="stock_inventory_line_8" model="stock.inventory.line">
-            <field name="product_id" ref="product.product_product_15"/>
-            <field name="product_uom_id" ref="product.product_uom_unit"/>
-            <field name="inventory_id" ref="stock_inventory_0"/>
-            <field name="product_qty">37.0</field>
-            <field name="location_id" ref="stock_location_components"/>
-        </record>
         <record id="stock_inventory_line_9" model="stock.inventory.line">
             <field name="product_id" ref="product.product_product_17"/>
             <field name="product_uom_id" ref="product.product_uom_unit"/>
@@ -122,13 +108,6 @@
             <field name="product_qty">39.0</field>
             <field name="location_id" ref="stock_location_components"/>
         </record>
-        <record id="stock_inventory_line_10" model="stock.inventory.line">
-            <field name="product_id" ref="product.product_product_18"/>
-            <field name="product_uom_id" ref="product.product_uom_unit"/>
-            <field name="inventory_id" ref="stock_inventory_0"/>
-            <field name="product_qty">45.0</field>
-            <field name="location_id" ref="stock_location_components"/>
-        </record>
         <record id="stock_inventory_line_11" model="stock.inventory.line">
             <field name="product_id" ref="product.product_product_12"/>
             <field name="product_uom_id" ref="product.product_uom_unit"/>
diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index 074b0048185..e75dfdd3d44 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -106,7 +106,7 @@
     location_id: stock.stock_location_stock
     location_dest_id: stock.stock_location_customers
     move_lines:
-      - product_id: product.product_product_31
+      - product_id: product.product_delivery_02
         product_uom: product.product_uom_unit
         product_uom_qty: 45.0
         picking_type_id: stock.picking_type_out
@@ -151,7 +151,7 @@
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_stock
     move_lines:
-      - product_id: product.product_product_48
+      - product_id: product.product_delivery_01
         product_uom: product.product_uom_unit
         product_uom_qty: 35.0
         picking_type_id: stock.picking_type_in
@@ -193,7 +193,7 @@
    location_id: stock.stock_location_suppliers
    location_dest_id: stock.stock_location_stock
    move_lines:
-     - product_id: product.product_product_31
+     - product_id: product.product_delivery_02
        product_uom: product.product_uom_unit
        product_uom_qty: 50.0
        picking_type_id: stock.picking_type_in
@@ -224,7 +224,7 @@
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_shop0
     move_lines:
-      - product_id: product.product_product_48
+      - product_id: product.product_delivery_01
         product_uom: product.product_uom_unit
         product_uom_qty: 180.0
         picking_type_id: chi_picking_type_in
@@ -232,7 +232,7 @@
         location_dest_id: stock.stock_location_shop0
         state: done
     pack_operation_ids:
-      - product_id: product.product_product_48
+      - product_id: product.product_delivery_01
         product_qty: 100
         product_uom_id: product.product_uom_unit
         location_id: stock.stock_location_suppliers
@@ -245,7 +245,7 @@
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_shop0
     move_lines:
-      - product_id: product.product_product_32
+      - product_id: product.product_delivery_01
         product_uom: product.product_uom_unit
         product_uom_qty: 45.0
         picking_type_id: chi_picking_type_in
@@ -310,7 +310,7 @@
     location_id: stock.stock_location_shop0
     location_dest_id: stock.stock_location_customers
     move_lines:
-      - product_id: product.product_product_31
+      - product_id: product.product_delivery_02
         product_uom: product.product_uom_unit
         product_uom_qty: 45.0
         picking_type_id: chi_picking_type_out
diff --git a/addons/stock/stock_orderpoint.xml b/addons/stock/stock_orderpoint.xml
index 5bbca72765b..8f0c4b7bdb9 100644
--- a/addons/stock/stock_orderpoint.xml
+++ b/addons/stock/stock_orderpoint.xml
@@ -3,20 +3,12 @@
 
         <!-- Resource: stock.warehouse.orderpoint -->
 
-        <record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint">
-            <field name="product_max_qty">25.0</field>
-            <field name="product_min_qty">5.0</field>
-            <field name="product_uom" ref="product.product_uom_dozen"/>
-            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field name="product_id" ref="product.product_product_36"/>
-            <!-- <field name="location_id" ref="stock.stock_location_stock"/> -->
-        </record>
         <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">10.0</field>
             <field name="product_min_qty">5.0</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field name="product_id" ref="product.product_product_28"/>
+            <field name="product_id" ref="product.product_delivery_02"/>
             <!-- <field name="location_id" ref="stock.stock_location_stock"/> -->
         </record>
         <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint">
@@ -27,28 +19,12 @@
             <field name="product_id" ref="product.product_product_20"/>
             <!-- <field name="location_id" ref="stock.stock_location_stock"/> -->           
         </record>
-        <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint">
-            <field name="product_max_qty">50.0</field>
-            <field name="product_min_qty">10.0</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field name="product_id" ref="product.product_product_46"/>
-            <!-- <field name="location_id" ref="stock.stock_location_stock"/> -->
-        </record>
-        <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint">
-            <field name="product_max_qty">15.0</field>
-            <field name="product_min_qty">5.0</field>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field name="product_id" ref="product.product_product_23"/>
-            <!-- <field name="location_id" ref="stock.stock_location_stock"/> -->
-        </record>
         <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">5.0</field>
             <field name="product_min_qty">3.0</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field name="product_id" ref="product.product_product_48"/>
+            <field name="product_id" ref="product.product_delivery_01"/>
             <!-- <field name="location_id" ref="stock.stock_location_stock"/> -->
         </record>
     </data>
diff --git a/addons/website_membership/demo/membership.xml b/addons/website_membership/demo/membership.xml
index fa70e22b1f0..9b43983711a 100644
--- a/addons/website_membership/demo/membership.xml
+++ b/addons/website_membership/demo/membership.xml
@@ -6,13 +6,13 @@
         <record id="base.res_partner_2" model="res.partner">
             <field name="website_published" eval="True"/>
         </record>
-        <record id="membership.membership_0" model="product.product">
+        <record id="product.membership_0" model="product.product">
             <field name="website_published" eval="True"/>
         </record>
-        <record id="membership.membership_1" model="product.product">
+        <record id="product.membership_1" model="product.product">
             <field name="website_published" eval="True"/>
         </record>
-        <record id="membership.membership_2" model="product.product">
+        <record id="product.membership_2" model="product.product">
             <field name="website_published" eval="True"/>
         </record>
     </data>
diff --git a/addons/website_portal_sale/data/demo.xml b/addons/website_portal_sale/data/demo.xml
index 799240fc5d9..4072f56214f 100644
--- a/addons/website_portal_sale/data/demo.xml
+++ b/addons/website_portal_sale/data/demo.xml
@@ -25,7 +25,7 @@
         <record id="sale_order_line_2" model="sale.order.line">
             <field name="order_id" ref="sale_order_1"/>
             <field name="name">Pen drive, 16GB</field>
-            <field name="product_id" ref="product.product_product_30"/>
+            <field name="product_id" ref="product.product_delivery_02"/>
             <field name="product_uom_qty">5</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">145.00</field>
@@ -34,7 +34,7 @@
         <record id="sale_order_line_3" model="sale.order.line">
             <field name="order_id" ref="sale_order_1"/>
             <field name="name">Headset USB</field>
-            <field name="product_id" ref="product.product_product_33"/>
+            <field name="product_id" ref="product.product_delivery_01"/>
             <field name="product_uom_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">65.00</field>
diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml
index 6a94c31f0b1..f1b11957d97 100644
--- a/addons/website_sale/data/demo.xml
+++ b/addons/website_sale/data/demo.xml
@@ -676,109 +676,34 @@ Weight: 31 grams</field>
         <record id="product.product_product_13_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
         </record>
-        <record id="product.product_product_14_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
-        </record>
-        <record id="product.product_product_15_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
-        </record>
         <record id="product.product_product_16_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
         </record>
         <record id="product.product_product_17_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
         </record>
-        <record id="product.product_product_18_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
-        </record>
-        <record id="product.product_product_19_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
-        </record>
         <record id="product.product_product_20_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
         </record>
-        <record id="product.product_product_21_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
-        </record>
         <record id="product.product_product_22_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
         </record>
-        <record id="product.product_product_23_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
-        </record>
         <record id="product.product_product_24_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
         </record>
         <record id="product.product_product_25_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.laptops')])]"/>
         </record>
-        <record id="product.product_product_26_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.laptops')])]"/>
-        </record>
         <record id="product.product_product_27_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.laptops')])]"/>
         </record>
-        <record id="product.product_product_28_product_template" model="product.template">
+        <record id="product.product_delivery_02_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.External_Hard_Drive')])]"/>
         </record>
-        <record id="product.product_product_29_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Pen_Drive')])]"/>
-        </record>
-        <record id="product.product_product_30_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Pen_Drive')])]"/>
-        </record>
-        <record id="product.product_product_31_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Speakers')])]"/>
-        </record>
-        <record id="product.product_product_32_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Headset')])]"/>
-        </record>
-        <record id="product.product_product_33_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Headset')])]"/>
-        </record>
-        <record id="product.product_product_34_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
-        </record>
-        <record id="product.product_product_35_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
-        </record>
-        <record id="product.product_product_36_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
-        </record>
-        <record id="product.product_product_37_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.printer')])]"/>
-        </record>
-        <record id="product.product_product_38_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.printer')])]"/>
-        </record>
-        <record id="product.product_product_39_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.printer')])]"/>
-        </record>
-        <record id="product.product_product_40_product_template" model="product.template">
+        <record id="product.product_order_01_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.Software')])]"/>
         </record>
-        <record id="product.product_product_41_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Software')])]"/>
-        </record>
-        <record id="product.product_product_42_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Software')])]"/>
-        </record>
-        <record id="product.product_product_43_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Software')])]"/>
-        </record>
-        <record id="product.product_product_44_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Software')])]"/>
-        </record>
-        <record id="product.product_product_45_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.network')])]"/>
-        </record>
-        <record id="product.product_product_46_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.Pen_Drive')])]"/>
-        </record>
-        <record id="product.product_product_47_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('product.network')])]"/>
-        </record>
-        <record id="product.product_product_48_product_template" model="product.template">
+        <record id="product.product_delivery_01_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
         </record>
 
diff --git a/addons/website_sale_options/data/demo.xml b/addons/website_sale_options/data/demo.xml
index 933468cc3a1..94628dbd841 100644
--- a/addons/website_sale_options/data/demo.xml
+++ b/addons/website_sale_options/data/demo.xml
@@ -29,7 +29,7 @@
             <field name="default_code">W0001</field>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product_attribute_value_1')])]"/>
         </record>
-        <record id="product_product_1b" model="product.product">
+        <record id="service_cost_01" model="product.product">
             <field name="default_code">W0002</field>
             <field name="product_tmpl_id" ref="product_product_1_product_template"/>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product_attribute_value_2')])]"/>