[IMP] product: Unify/Clean product demo data

PURPOSE
=======

1. Unified product demo data
2. Less demo: one per use case
3. Demo data for all models

Specification
=============

1. Refactor all the brol in the demo data
2. Adapt the tests to make them green, as some products are
   renamed, removed, created in python instead of as demo data
   ...

2 files changed, 106 insertions, 294 deletions

diff --git a/addons/product/data/product_demo.xml b/addons/product/data/product_demo.xml
index ab215f07807..09e3fc12afd 100644
--- a/addons/product/data/product_demo.xml
+++ b/addons/product/data/product_demo.xml
@@ -16,16 +16,20 @@
         </record>
         <record id="product_category_5" model="product.category">
             <field name="parent_id" ref="product_category_1"/>
-            <field name="name">Physical</field>
+            <field name="name">Office Furniture</field>
+        </record>
+        <record id="product_category_consumable" model="product.category">
+            <field name="parent_id" ref="product_category_all"/>
+            <field name="name">Consumable</field>
         </record>
 
         <!-- Expensable products -->
         <record id="expense_product" model="product.product">
-            <field name="name">General Expense</field>
+            <field name="name">Restaurant Expenses</field>
             <field name="list_price">14.0</field>
             <field name="standard_price">8.0</field>
             <field name="type">service</field>
-            <field name="default_code">EXP</field>
+            <field name="default_code">EXP_REST</field>
             <field name="categ_id" ref="product.cat_expense"/>
         </record>
 
@@ -34,126 +38,95 @@
             <field name="list_price">400.0</field>
             <field name="standard_price">400.0</field>
             <field name="type">service</field>
-            <field name="default_code">EXP</field>
+            <field name="default_code">EXP_HA</field>
             <field name="uom_id" ref="uom.product_uom_day"/>
             <field name="uom_po_id" ref="uom.product_uom_day"/>
             <field name="categ_id" ref="cat_expense"/>
         </record>
 
         <!-- Service products -->
-        <record id="service_order_01" model="product.product">
-            <field name="name">Prepaid Consulting</field>
+        <record id="product_product_1" model="product.product">
+            <field name="name">Virtual Interior Design</field>
             <field name="categ_id" ref="product_category_3"/>
-            <field name="standard_price">40</field>
-            <field name="list_price">90</field>
+            <field name="standard_price">20.5</field>
+            <field name="list_price">30.75</field>
             <field name="type">service</field>
             <field name="uom_id" ref="uom.product_uom_hour"/>
             <field name="uom_po_id" ref="uom.product_uom_hour"/>
-            <field name="description">Example of product to invoice on order.</field>
-            <field name="default_code">SERV_ORDER</field>
-        </record>
-
-        <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="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">SERV_DEL</field>
         </record>
 
-        <record id="service_cost_01" model="product.product">
-            <field name="name">External Audit</field>
+        <record id="product_product_2" model="product.product">
+            <field name="name">Virtual Home Staging</field>
             <field name="categ_id" ref="product_category_3"/>
-            <field name="standard_price">160</field>
-            <field name="list_price">180</field>
+            <field name="standard_price">25.5</field>
+            <field name="list_price">38.25</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="description">Example of products to invoice based on cost.</field>
-            <field name="default_code">SERV_COST</field>
+            <field name="uom_id" ref="uom.product_uom_hour"/>
+            <field name="uom_po_id" ref="uom.product_uom_hour"/>
         </record>
 
+        <!-- Physical Products -->
+
         <record id="product_delivery_01" model="product.product">
-            <field name="name">Switch, 24 ports</field>
+            <field name="name">Office Chair</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="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">PROD_DEL</field>
+            <field name="default_code">FURN_7777</field>
+            <field name="image" type="base64" file="product/static/img/product_chair.png"/>
         </record>
 
         <record id="product_delivery_02" model="product.product">
-            <field name="name">Datacard</field>
+            <field name="name">Office Lamp</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="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">PROD_DEL02</field>
+            <field name="default_code">FURN_8888</field>
+            <field name="image" type="base64" file="product/static/img/product_lamp.png"/>
         </record>
 
         <record id="product_order_01" model="product.product">
-            <field name="name">Zed+ Antivirus</field>
+            <field name="name">Office Design Software</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="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.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="uom.product_uom_hour"/>
-            <field name="uom_po_id" ref="uom.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>
-            <field name="categ_id" ref="product_category_3"/>
-            <field name="standard_price">25.5</field>
-            <field name="list_price">38.25</field>
-            <field name="type">service</field>
-            <field name="uom_id" ref="uom.product_uom_hour"/>
-            <field name="uom_po_id" ref="uom.product_uom_hour"/>
-            <field name="description">Example of product to invoice based on delivery.</field>
+            <field name="default_code">FURN_9999</field>
+            <field name="image" type="base64" file="product/static/img/product_product_43-image.jpg"/>
         </record>
 
         <record id="product_product_3" model="product.product">
-            <field name="name">Computer SC234</field>
+            <field name="name">Desk Combination</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="list_price">450.0</field>
             <field name="standard_price">300.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="description_sale">17" LCD Monitor&#xA;Processor AMD 8-Core</field>
-            <field name="default_code">PCSC234</field>
+            <field name="description_sale">Desk combination, black-brown: chair + desk + drawer.</field>
+            <field name="default_code">FURN_7800</field>
+            <field name="image" type="base64" file="product/static/img/product_product_3-image.jpg"/>
         </record>
 
-        <!-- Ecommerce Variants and Products -->
+        <!-- Variants -->
 
         <record id="product_attribute_1" model="product.attribute">
-            <field name="name">Memory</field>
+            <field name="name">Legs</field>
         </record>
         <record id="product_attribute_value_1" model="product.attribute.value">
-            <field name="name">16 GB</field>
+            <field name="name">Steel</field>
             <field name="attribute_id" ref="product_attribute_1"/>
         </record>
         <record id="product_attribute_value_2" model="product.attribute.value">
-            <field name="name">32 GB</field>
+            <field name="name">Aluminium</field>
             <field name="attribute_id" ref="product_attribute_1"/>
         </record>
 
@@ -170,39 +143,50 @@
         </record>
 
         <record id="product_attribute_3" model="product.attribute">
-            <field name="name">Wi-Fi</field>
+            <field name="name">Quality</field>
         </record>
         <record id="product_attribute_value_5" model="product.attribute.value">
-            <field name="name">2.4 GHz</field>
+            <field name="name">Premium</field>
             <field name="attribute_id" ref="product_attribute_3"/>
         </record>
 
-        <record id="product_product_4" model="product.product">
-            <field name="name">iPad Retina Display</field>
+        <record id="product_product_4_product_template" model="product.template">
+            <field name="name">Desk Customizable</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">500.0</field>
             <field name="list_price">750.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="description_sale">7.9‑inch (diagonal) LED-backlit, 128Gb&#xA;Dual-core A5 with quad-core graphics&#xA;FaceTime HD Camera, 1.2 MP Photos</field>
-            <field name="default_code">E-COM01</field>
+            <field name="description_sale">160x80cm, with large legs.</field>
+        </record>
+        <record id="product_product_4" model="product.product">
+            <field name="default_code">FURN_0096</field>
+            <field name="standard_price">500.0</field>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_1'), ref('product.product_attribute_value_3')])]"/>
+            <field name="product_tmpl_id" ref="product_product_4_product_template"/>
+            <field name="image" type="base64" file="product/static/img/table02.png"/>
         </record>
         <record id="product_product_4b" model="product.product">
-            <field name="default_code">E-COM02</field>
+            <field name="default_code">FURN_0097</field>
             <field name="product_tmpl_id" ref="product_product_4_product_template"/>
+            <field name="standard_price">500.0</field>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_1'), ref('product.product_attribute_value_4')])]"/>
+            <field name="image" type="base64" file="product/static/img/table04.png"/>
         </record>
         <record id="product_product_4c" model="product.product">
-            <field name="default_code">E-COM03</field>
+            <field name="default_code">FURN_0098</field>
+            <field name="standard_price">500.0</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')])]"/>
+            <field name="image" type="base64" file="product/static/img/table03.png"/>
         </record>
         <record id="product_product_4d" model="product.product">
-            <field name="default_code">E-COM04</field>
+            <field name="default_code">DESK0004</field>
             <field name="product_tmpl_id" ref="product_product_4_product_template"/>
+            <field name="standard_price">500.0</field>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_2'), ref('product.product_attribute_value_4')])]"/>
+            <field name="image" type="base64" file="product/static/img/table01.png"/>
         </record>
 
         <record id="product_attribute_line_1" model="product.attribute.line">
@@ -235,40 +219,20 @@
             <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"/>
-            <field name="standard_price">140.0</field>
-            <field name="list_price">247.0</field>
-            <field name="type">consu</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="description_sale">Bose's smallest portable Bluetooth speaker</field>
-            <field name="default_code">E-COM05</field>
-        </record>
-
-
         <record id="product_product_5" model="product.product">
-            <field name="name">Custom Computer (kit)</field>
+            <field name="name">Corner Desk Right Sit</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">600.0</field>
             <field name="list_price">147.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="description">Custom computer shipped in kit.</field>
             <field name="default_code">E-COM06</field>
-        </record>
-        <record id="product_product_5c" model="product.product">
-            <field name="name">Parts Replacement</field>
-            <field name="categ_id" ref="product_category_3"/>
-            <field name="standard_price">600.0</field>
-            <field name="list_price">147.0</field>
-            <field name="type">service</field>
+            <field name="image" type="base64" file="product/static/img/product_product_5-image.png"/>
         </record>
 
         <record id="product_product_6" model="product.product">
-            <field name="name">iPad Mini</field>
+            <field name="name">Large Cabinet</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">800.0</field>
             <field name="list_price">320.0</field>
@@ -277,17 +241,11 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM07</field>
             <field name='weight'>0.330</field>
+            <field name="image" type="base64" file="product/static/img/product_product_6-image.png"/>
         </record>
 
-        <record id="product_product_6c" model="product.product">
-            <field name="name">Repair</field>
-            <field name="categ_id" ref="product_category_3"/>
-            <field name="standard_price">800.0</field>
-            <field name="list_price">320.0</field>
-            <field name="type">service</field>
-        </record>
         <record id="product_product_7" model="product.product">
-            <field name="name">Apple In-Ear Headphones</field>
+            <field name="name">Storage Box</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">70.0</field>
             <field name="list_price">79.0</field>
@@ -295,10 +253,11 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM08</field>
+            <field name="image" type="base64" file="product/static/img/product_product_7-image.png"/>
         </record>
 
         <record id="product_product_8" model="product.product">
-            <field name="name">iMac</field>
+            <field name="name">Large Desk</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">1299.0</field>
             <field name="list_price">1799.0</field>
@@ -307,10 +266,11 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM09</field>
             <field name='weight'>9.54</field>
+            <field name="image" type="base64" file="product/static/img/product_product_8-image.png"/>
         </record>
 
         <record id="product_product_9" model="product.product">
-            <field name="name">Apple Wireless Keyboard</field>
+            <field name="name">Pedal Bin</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">10.0</field>
             <field name="list_price">47.0</field>
@@ -318,10 +278,11 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM10</field>
+            <field name="image" type="base64" file="product/static/img/product_product_9-image.png"/>
         </record>
 
         <record id="product_product_10" model="product.product">
-            <field name="name">Mouse, Optical</field>
+            <field name="name">Cabinet with Doors</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">12.50</field>
             <field name="list_price">14</field>
@@ -329,10 +290,11 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM11</field>
+            <field name="image" type="base64" file="product/static/img/product_product_10-image.png"/>
         </record>
 
         <record id="product_product_11" model="product.product">
-            <field name="name">iPod</field>
+            <field name="name">Conference Chair</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">14</field>
             <field name="list_price">16.50</field>
@@ -341,19 +303,14 @@
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="default_code">E-COM12</field>
             <field name="attribute_value_ids" eval="[(6,0,[ref('product.product_attribute_value_1')])]"/>
+            <field name="image" type="base64" file="product/static/img/product_product_11-image.png"/>
         </record>
         <record id="product_product_11b" model="product.product">
+            <field name="name">Conference Chair</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>
-        <record id="product_product_11c" model="product.product">
-            <field name="name">Cleaning</field>
-            <field name="categ_id" ref="product_category_3"/>
-            <field name="standard_price">14</field>
-            <field name="list_price">16.50</field>
-            <field name="type">service</field>
-        </record>
 
         <record id="product_attribute_line_4" model="product.attribute.line">
             <field name="product_tmpl_id" ref="product_product_11_product_template"/>
@@ -374,107 +331,103 @@
         <!-- MRP Demo Data-->
 
         <record id="product_product_12" model="product.product">
-            <field name="name">Mouse, Wireless</field>
+            <field name="name">Office Chair Black</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">18</field>
             <field name="list_price">12.50</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">M-Wir</field>
+            <field name="default_code">FURN_0269</field>
+            <field name="image" type="base64" file="product/static/img/product_product_12-image.png"/>
         </record>
 
         <record id="product_product_13" model="product.product">
-            <field name="name">RAM SR5</field>
+            <field name="name">Corner Desk Black</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">78.0</field>
             <field name="list_price">85.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">RAM-SR5</field>
+            <field name="default_code">FURN_1118</field>
+            <field name="image" type="base64" file="product/static/img/product_product_13-image.png"/>
         </record>
 
         <record id="product_product_16" model="product.product">
-            <field name="name">Computer Case</field>
+            <field name="name">Drawer Black</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">20.0</field>
             <field name="list_price">25.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">C-Case</field>
-        </record>
-
-        <record id="product_product_17" model="product.product">
-            <field name="name">HDD SH-1</field>
-            <field name="categ_id" ref="product_category_5"/>
-            <field name="standard_price">860.0</field>
-            <field name="list_price">975.0</field>
-            <field name="type">consu</field>
-            <field name="uom_id" ref="uom.product_uom_unit"/>
-            <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">HDD-SH1</field>
+            <field name="default_code">FURN_8900</field>
+            <field name="image" type="base64" file="product/static/img/product_product_16-image.png"/>
         </record>
 
         <record id="product_product_20" model="product.product">
-            <field name="name">Motherboard I9P57</field>
+            <field name="name">Flipover</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">1700.0</field>
             <field name="list_price">1950.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">MBi9</field>
+            <field name="default_code">FURN_9001</field>
+            <field name="image" type="base64" file="product/static/img/product_product_20-image.png"/>
         </record>
         <record id="product_product_22" model="product.product">
-            <field name="name">Processor Core i5 2.70 Ghz</field>
+            <field name="name">Desk Stand with Screen</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">2010.0</field>
             <field name="list_price">2100.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">CPUi5</field>
+            <field name="default_code">FURN_7888</field>
+            <field name="image" type="base64" file="product/static/img/product_product_22-image.png"/>
         </record>
 
         <record id="product_product_24" model="product.product">
-            <field name="name">Graphics Card</field>
+            <field name="name">Individual Workplace</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">876.0</field>
             <field name="list_price">885.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">CARD</field>
+            <field name="default_code">FURN_0789</field>
+            <field name="image" type="base64" file="product/static/img/product_product_24-image.png"/>
         </record>
 
         <record id="product_product_25" model="product.product">
-            <field name="name">Laptop E5023</field>
+            <field name="name">Acoustic Bloc Screens</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">2870.0</field>
             <field name="list_price">2950.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="description">17" Monitor, 4GB RAM&#xA;Standard-1294P Processor</field>
-            <field name="default_code">LAP-E5</field>
+            <field name="default_code">FURN_6666</field>
+            <field name="image" type="base64" file="product/static/img/product_product_25-image.png"/>
         </record>
 
         <record id="product_product_27" model="product.product">
-            <field name="name">Laptop Customized</field>
+            <field name="name">Drawer</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">3300.0</field>
             <field name="list_price">3645.0</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="description">Custom Laptop based on customer's requirement.</field>
-            <field name="default_code">LAP-CUS</field>
+            <field name="description">Drawer with two routing possiblities.</field>
+            <field name="default_code">FURN_8855</field>
+            <field name="image" type="base64" file="product/static/img/product_product_27-image.png"/>
         </record>
 
         <record id="consu_delivery_03" model="product.product">
-            <field name="name">Basic Computer</field>
+            <field name="name">Four Person Desk</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">25000.0</field>
             <field name="list_price">23500.0</field>
@@ -482,11 +435,12 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="description_sale">Dvorak keyboard&#xA;left-handed mouse</field>
-            <field name="default_code">CONS_DEL03</field>
+            <field name="default_code">FURN_8220</field>
+            <field name="image" type="base64" file="product/static/img/product_product_d03-image.png"/>
         </record>
 
         <record id="consu_delivery_02" model="product.product">
-            <field name="name">Little server</field>
+            <field name="name">Large Meeting Table</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">45000.0</field>
             <field name="list_price">40000.0</field>
@@ -494,11 +448,12 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="description_sale">raid 1, 512ECC ram</field>
-            <field name="default_code">CONS_DEL02</field>
+            <field name="default_code">FURN_6741</field>
+            <field name="image" type="base64" file="product/static/img/product_product_46-image.png"/>
         </record>
 
         <record id="consu_delivery_01" model="product.product">
-            <field name="name">Server</field>
+            <field name="name">Three-Seat Sofa</field>
             <field name="categ_id" ref="product_category_5"/>
             <field name="standard_price">65000.0</field>
             <field name="list_price">60000.0</field>
@@ -506,33 +461,8 @@
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="description_sale">raid 10, 2048ECC ram</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"/>
+            <field name="default_code">FURN_8999</field>
+            <field name="image" type="base64" file="product/static/img/product_product_d01-image.png"/>
         </record>
 
         <!--
@@ -627,14 +557,6 @@
             <field name="price">20</field>
         </record>
 
-        <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>
-            <field name="min_qty">1</field>
-            <field name="price">860</field>
-        </record>
-
         <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"/>
diff --git a/addons/product/data/product_image_demo.xml b/addons/product/data/product_image_demo.xml
deleted file mode 100644
index ab98b4a7030..00000000000
--- a/addons/product/data/product_image_demo.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="false">
-
-        <record id="product_product_1" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_1-image.jpg"/>
-        </record>
-
-        <record id="product_product_2" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_2-image.jpg"/>
-        </record>
-
-        <record id="product_product_3" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_3-image.jpg"/>
-        </record>
-
-        <record id="product_product_4" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_4-image.png"/>
-        </record>
-
-        <record id="product_product_5" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_5-image.jpg"/>
-        </record>
-
-        <record id="product_product_5b" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_5-image.png"/>
-        </record>
-
-        <record id="product_product_6" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_6-image.png"/>
-        </record>
-
-        <record id="product_product_7" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_7-image.png"/>
-        </record>
-
-        <record id="product_product_8" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_8-image.png"/>
-        </record>
-
-        <record id="product_product_9" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_9-image.png"/>
-        </record>
-
-        <record id="product_product_10" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_10-image.jpg"/>
-        </record>
-
-        <record id="product_product_11" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_11-image.png"/>
-        </record>
-
-        <record id="product_product_12" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_12-image.jpg"/>
-        </record>
-
-        <record id="product_product_13" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_13-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>
-
-        <record id="product_product_17" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_17-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_22" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_22-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>
-
-        <record id="product_product_25" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_25-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_order_01" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_43-image.jpg"/>
-        </record>
-
-        <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="membership_0" model="product.product">
-            <field name="image" type="base64" file="product/static/img/membership_0-image.jpg"/>
-        </record>
-
-        <record id="membership_1" model="product.product">
-            <field name="image" type="base64" file="product/static/img/membership_1-image.jpg"/>
-        </record>
-
-        <record id="membership_2" model="product.product">
-            <field name="image" type="base64" file="product/static/img/membership_2-image.jpg"/>
-        </record>
-
-    </data>
-</odoo>