diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 3cdeb85df89..79d8d2bc024 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -29,7 +29,7 @@
             <field name="uom_po_id" ref="product.product_uom_hour"/>
             <field name="type">service</field>
             <field name="name">Assembly Service Cost</field>
-            <field name="categ_id" ref="product.product_category_14"/>
+            <field name="categ_id" ref="product.product_category_11"/>
             <field name="product_image">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</field>
         </record>
 
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 1ee94867c4c..67cee9f9d65 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -32,41 +32,29 @@
         </record>
         <record id="product_category_6" model="product.category">
             <field name="parent_id" ref="product_category_1"/>
-            <field name="name">Network Components</field>
+            <field name="name">External Devices</field>
         </record>
         <record id="product_category_7" model="product.category">
-            <field name="parent_id" ref="product_category_4"/>
-            <field name="name">Desktops</field>
-        </record>
-        <record id="product_category_8" model="product.category">
-            <field name="parent_id" ref="product_category_4"/>
-            <field name="name">Laptops</field>
-        </record>
-        <record id="product_category_9" model="product.category">
-            <field name="parent_id" ref="product_category_4"/>
+            <field name="parent_id" ref="product_category_1"/>
             <field name="name">Accessories</field>
         </record>
-        <record id="product_category_10" model="product.category">
-            <field name="parent_id" ref="product_category_4"/>
+        <record id="product_category_8" model="product.category">
+            <field name="parent_id" ref="product_category_1"/>
             <field name="name">Components</field>
         </record>
-        <record id="product_category_11" model="product.category">
-            <field name="parent_id" ref="product_category_4"/>
-            <field name="name">Printer &amp; Scanners</field>
-        </record>
-        <record id="product_category_12" model="product.category">
-            <field name="parent_id" ref="product_category_4"/>
+        <record id="product_category_9" model="product.category">
+            <field name="parent_id" ref="product_category_1"/>
             <field name="name">Software</field>
         </record>
-        <record id="product_category_13" model="product.category">
+        <record id="product_category_10" model="product.category">
             <field name="parent_id" ref="product_category_3"/>
             <field name="name">Raw Materials</field>
         </record>
-        <record id="product_category_14" model="product.category">
+        <record id="product_category_11" model="product.category">
             <field name="name">Assembly Service</field>
             <field name="parent_id" ref="product_category_5"/>
         </record>
-        <record id="product_category_15" model="product.category">
+        <record id="product_category_12" model="product.category">
             <field name="parent_id" ref="product_category_5"/>
             <field name="name">On site Intervention</field>
         </record>
@@ -85,12 +73,12 @@
     -->
 
         <record id="product_product_consultant" model="product.product">
-            <field name="categ_id" ref="product.product_category_15"/>
+            <field name="categ_id" ref="product.product_category_12"/>
         </record>
 
         <record id="product_product_1" model="product.product">
             <field name="name">On Site Monitoring</field>
-            <field name="categ_id" ref="product_category_15"/>
+            <field name="categ_id" ref="product_category_12"/>
             <field name="standard_price">20.5</field>
             <field name="list_price">30.75</field>
             <field name="type">service</field>
@@ -104,7 +92,7 @@
 
         <record id="product_product_2" model="product.product">
             <field name="name">On Site Assistance</field>
-            <field name="categ_id" ref="product_category_14"/>
+            <field name="categ_id" ref="product_category_11"/>
             <field name="standard_price">25.5</field>
             <field name="list_price">38.25</field>
             <field name="type">service</field>
@@ -118,7 +106,7 @@
         <record id="product_product_3" model="product.product">
             <field name="name">PC Assemble SC234</field>
             <field name="default_code">PCSC234</field>
-            <field name="categ_id" ref="product_category_7"/>
+            <field name="categ_id" ref="product_category_4"/>
             <field name="list_price">450.0</field>
             <field name="standard_price">300.0</field>
             <field name="type">product</field>
@@ -136,7 +124,7 @@ HDD SH-1</field>
         <record id="product_product_4" model="product.product">
             <field name="name">PC Assemble SC349</field>
             <field name="default_code">PCSC349</field>
-            <field name="categ_id" ref="product_category_7"/>
+            <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">500.0</field>
             <field name="list_price">750.0</field>
             <field name="type">product</field>
@@ -154,7 +142,7 @@ HDD SH-1</field>
         <record id="product_product_5" model="product.product">
             <field name="name">PC Assemble + Custom (PC on Demand)</field>
             <field name="default_code">PC-DEM</field>
-            <field name="categ_id" ref="product_category_7"/>
+            <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">600.0</field>
             <field name="list_price">900.0</field>
             <field name="type">product</field>
@@ -169,7 +157,7 @@ HDD SH-1</field>
         <record id="product_product_6" model="product.product">
             <field name="name">15” LCD Monitor</field>
             <field name="default_code">LCD15</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">800.0</field>
             <field name="list_price">1200.0</field>
             <field name="type">product</field>
@@ -179,7 +167,7 @@ HDD SH-1</field>
         <record id="product_product_7" model="product.product">
             <field name="name">17” LCD Monitor</field>
             <field name="default_code">LCD17</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">880.0</field>
             <field name="list_price">1350.0</field>
             <field name="type">product</field>
@@ -189,7 +177,7 @@ HDD SH-1</field>
         <record id="product_product_8" model="product.product">
             <field name="name">USB Keyboard, QWERTY</field>
             <field name="default_code">KeyQ</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">10.0</field>
             <field name="list_price">13.0</field>
             <field name="type">product</field>
@@ -199,7 +187,7 @@ HDD SH-1</field>
         <record id="product_product_9" model="product.product">
             <field name="name">USB Keyboard, AZERTY</field>
             <field name="default_code">KeyA</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">10.0</field>
             <field name="list_price">13.0</field>
             <field name="type">product</field>
@@ -210,7 +198,7 @@ HDD SH-1</field>
         <record id="product_product_10" model="product.product">
             <field name="name">Mouse, Optical</field>
             <field name="default_code">M-Opt</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">12.50</field>
             <field name="list_price">14</field>
             <field name="type">product</field>
@@ -220,7 +208,7 @@ HDD SH-1</field>
         <record id="product_product_11" model="product.product">
             <field name="name">Mouse, Laser</field>
             <field name="default_code">M-Las</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">14</field>
             <field name="list_price">16.50</field>
             <field name="type">product</field>
@@ -230,7 +218,7 @@ HDD SH-1</field>
         <record id="product_product_12" model="product.product">
             <field name="name">Mouse, Wireless</field>
             <field name="default_code">M-Wir</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">18</field>
             <field name="list_price">12.50</field>
             <field name="type">product</field>
@@ -241,7 +229,7 @@ HDD SH-1</field>
         <record id="product_product_13" model="product.product">
             <field name="name">RAM SR5</field>
             <field name="default_code">RAM-SR5</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">78.0</field>
             <field name="list_price">85.0</field>
             <field name="type">product</field>
@@ -251,7 +239,7 @@ HDD SH-1</field>
         <record id="product_product_14" model="product.product">
             <field name="name">RAM SR2</field>
             <field name="default_code">RAM-SR2</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">87.0</field>
             <field name="list_price">95.0</field>
             <field name="type">product</field>
@@ -261,7 +249,7 @@ HDD SH-1</field>
         <record id="product_product_15" model="product.product">
             <field name="name">RAM SR3</field>
             <field name="default_code">RAM-SR3</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">80.0</field>
             <field name="list_price">85.0</field>
             <field name="type">product</field>
@@ -271,7 +259,7 @@ HDD SH-1</field>
         <record id="product_product_16" model="product.product">
             <field name="name">Computer Case</field>
             <field name="default_code">C-Case</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">20.0</field>
             <field name="list_price">25.0</field>
             <field name="type">product</field>
@@ -283,7 +271,7 @@ HDD SH-1</field>
         <record id="product_product_17" model="product.product">
             <field name="name">HDD SH-1</field>
             <field name="default_code">HDD-SH1</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">860.0</field>
             <field name="list_price">975.0</field>
             <field name="type">product</field>
@@ -293,7 +281,7 @@ HDD SH-1</field>
         <record id="product_product_18" model="product.product">
             <field name="name">HDD SH-2</field>
             <field name="default_code">HDD-SH2</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1020.0</field>
             <field name="list_price">1150.0</field>
             <field name="type">product</field>
@@ -305,7 +293,7 @@ HDD SH-1</field>
         <record id="product_product_19" model="product.product">
             <field name="name">HDD on Demand</field>
             <field name="default_code">HDD-DEM</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1100.0</field>
             <field name="list_price">1250.0</field>
             <field name="type">product</field>
@@ -318,7 +306,7 @@ HDD SH-1</field>
         <record id="product_product_20" model="product.product">
             <field name="name">Motherboard I9P57</field>
             <field name="default_code">MBi9</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1700.0</field>
             <field name="list_price">1950.0</field>
             <field name="type">product</field>
@@ -328,7 +316,7 @@ HDD SH-1</field>
         <record id="product_product_21" model="product.product">
             <field name="name">Motherboard A20Z7</field>
             <field name="default_code">MBa20</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1790.0</field>
             <field name="list_price">2000.0</field>
             <field name="type">product</field>
@@ -338,7 +326,7 @@ HDD SH-1</field>
         <record id="product_product_22" model="product.product">
             <field name="name">Processor Core i5 2.70 Ghz</field>
             <field name="default_code">CPUi5</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">2010.0</field>
             <field name="list_price">2100.0</field>
             <field name="type">product</field>
@@ -348,7 +336,7 @@ HDD SH-1</field>
         <record id="product_product_23" model="product.product">
             <field name="name">Processor AMD 8-Core</field>
             <field name="default_code">CPUa8</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1910.0</field>
             <field name="list_price">1980.0</field>
             <field name="type">product</field>
@@ -358,7 +346,7 @@ HDD SH-1</field>
         <record id="product_product_24" model="product.product">
             <field name="name">Graphics Card</field>
             <field name="default_code">CARD</field>
-            <field name="categ_id" ref="product_category_10"/>
+            <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">876.0</field>
             <field name="list_price">885.0</field>
             <field name="type">product</field>
@@ -368,7 +356,7 @@ HDD SH-1</field>
         <record id="product_product_25" model="product.product">
             <field name="name">Laptop E5023</field>
             <field name="default_code">LAP-E5</field>
-            <field name="categ_id" ref="product_category_8"/>
+            <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">2870.0</field>
             <field name="list_price">2950.0</field>
             <field name="type">product</field>
@@ -382,7 +370,7 @@ QWERTY keyboard</field>
         <record id="product_product_26" model="product.product">
             <field name="name">Laptop S3450</field>
             <field name="default_code">LAP-S3</field>
-            <field name="categ_id" ref="product_category_8"/>
+            <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">3000.0</field>
             <field name="list_price">3245.0</field>
             <field name="type">product</field>
@@ -396,7 +384,7 @@ QWERTY keyboard</field>
         <record id="product_product_27" model="product.product">
             <field name="name">Laptop Customized</field>
             <field name="default_code">LAP-CUS</field>
-            <field name="categ_id" ref="product_category_8"/>
+            <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">3300.0</field>
             <field name="list_price">3645.0</field>
             <field name="type">product</field>
@@ -409,7 +397,7 @@ QWERTY keyboard</field>
         <record id="product_product_28" model="product.product">
             <field name="name">External Hard disk</field>
             <field name="default_code">EXT-HDD</field>
-            <field name="categ_id" ref="product_category_9"/>
+            <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">390.0</field>
             <field name="list_price">405.0</field>
             <field name="type">product</field>
@@ -420,7 +408,7 @@ QWERTY keyboard</field>
         <record id="product_product_29" model="product.product">
             <field name="name">Pen drive, SP-2</field>
             <field name="default_code">PD-SP2</field>
-            <field name="categ_id" ref="product_category_9"/>
+            <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">90.0</field>
             <field name="list_price">100.0</field>
             <field name="type">product</field>
@@ -431,7 +419,7 @@ QWERTY keyboard</field>
         <record id="product_product_30" model="product.product">
             <field name="name">Pen drive, SP-4</field>
             <field name="default_code">PD-SP4</field>
-            <field name="categ_id" ref="product_category_9"/>
+            <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">126.0</field>
             <field name="list_price">145.0</field>
             <field name="type">product</field>
@@ -441,7 +429,7 @@ QWERTY keyboard</field>
         <record id="product_product_31" model="product.product">
             <field name="name">Multimedia Speakers</field>
             <field name="default_code">MM-SPK</field>
-            <field name="categ_id" ref="product_category_9"/>
+            <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">134.0</field>
             <field name="list_price">150.0</field>
             <field name="type">product</field>
@@ -452,7 +440,7 @@ QWERTY keyboard</field>
         <record id="product_product_32" model="product.product">
             <field name="name">Headset standard</field>
             <field name="default_code">HEAD</field>
-            <field name="categ_id" ref="product_category_9"/>
+            <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">57.0</field>
             <field name="list_price">62.0</field>
             <field name="type">product</field>
@@ -463,7 +451,7 @@ QWERTY keyboard</field>
         <record id="product_product_33" model="product.product">
             <field name="name">Headset USB</field>
             <field name="default_code">HEAD-USB</field>
-            <field name="categ_id" ref="product_category_9"/>
+            <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">60.0</field>
             <field name="list_price">65.0</field>
             <field name="type">product</field>
@@ -476,7 +464,7 @@ QWERTY keyboard</field>
         <record id="product_product_34" model="product.product">
             <field name="name">Webcam</field>
             <field name="default_code">WCAM</field>
-            <field name="categ_id" ref="product_category_9"/>
+            <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">38.0</field>
             <field name="list_price">45.0</field>
             <field name="type">product</field>
@@ -487,7 +475,7 @@ QWERTY keyboard</field>
         <record id="product_product_35" model="product.product">
             <field name="name">Blank CD</field>
             <field name="default_code">CD</field>
-            <field name="categ_id" ref="product_category_9"/>
+            <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">18.40</field>
             <field name="list_price">20.0</field>
             <field name="type">product</field>
@@ -498,7 +486,7 @@ QWERTY keyboard</field>
         <record id="product_product_36" model="product.product">
             <field name="name">Blank DVD-RW</field>
             <field name="default_code">DVD</field>
-            <field name="categ_id" ref="product_category_9"/>
+            <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">21.60</field>
             <field name="list_price">24.0</field>
             <field name="type">product</field>
@@ -509,7 +497,7 @@ QWERTY keyboard</field>
         <record id="product_product_37" model="product.product">
             <field name="name">Printer, All-in-one</field>
             <field name="default_code">PRINT</field>
-            <field name="categ_id" ref="product_category_11"/>
+            <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">4258.0</field>
             <field name="list_price">4410.0</field>
             <field name="type">product</field>
@@ -522,7 +510,7 @@ QWERTY keyboard</field>
         <record id="product_product_38" model="product.product">
             <field name="name">Ink Cartridge</field>
             <field name="default_code">INK</field>
-            <field name="categ_id" ref="product_category_11"/>
+            <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">60.0</field>
             <field name="list_price">65.0</field>
             <field name="type">product</field>
@@ -533,7 +521,7 @@ QWERTY keyboard</field>
         <record id="product_product_39" model="product.product">
             <field name="name">Toner Cartridge</field>
             <field name="default_code">TONER</field>
-            <field name="categ_id" ref="product_category_11"/>
+            <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">66.0</field>
             <field name="list_price">70.0</field>
             <field name="type">product</field>
@@ -544,7 +532,7 @@ QWERTY keyboard</field>
         <record id="product_product_40" model="product.product">
             <field name="name">Windows 7 Professional</field>
             <field name="default_code">Win7</field>
-            <field name="categ_id" ref="product_category_12"/>
+            <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">330.0</field>
             <field name="list_price">470.0</field>
             <field name="type">consu</field>
@@ -555,7 +543,7 @@ QWERTY keyboard</field>
         <record id="product_product_41" model="product.product">
             <field name="name">Windows Home Server 2011</field>
             <field name="default_code">WServer</field>
-            <field name="categ_id" ref="product_category_12"/>
+            <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">540.0</field>
             <field name="list_price">620.0</field>
             <field name="type">consu</field>
@@ -566,7 +554,7 @@ QWERTY keyboard</field>
         <record id="product_product_42" model="product.product">
             <field name="name">Office Suite</field>
             <field name="default_code">OSuite</field>
-            <field name="categ_id" ref="product_category_12"/>
+            <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">110.0</field>
             <field name="list_price">170.0</field>
             <field name="type">consu</field>
@@ -578,7 +566,7 @@ QWERTY keyboard</field>
         <record id="product_product_43" model="product.product">
             <field name="name">Zed+ Antivirus</field>
             <field name="default_code">Zplus</field>
-            <field name="categ_id" ref="product_category_12"/>
+            <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">235.0</field>
             <field name="list_price">280.0</field>
             <field name="type">consu</field>
@@ -589,7 +577,7 @@ QWERTY keyboard</field>
         <record id="product_product_44" model="product.product">
             <field name="name">GrapWorks Software</field>
             <field name="default_code">GRAPs/w</field>
-            <field name="categ_id" ref="product_category_12"/>
+            <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">155.0</field>
             <field name="list_price">173.0</field>
             <field name="type">consu</field>
diff --git a/addons/product/product_pricelist_demo.yml b/addons/product/product_pricelist_demo.yml
index c0682abe5a9..39f6cfc16b2 100644
--- a/addons/product/product_pricelist_demo.yml
+++ b/addons/product/product_pricelist_demo.yml
@@ -1,7 +1,7 @@
 -
   !record {model: product.product, id: product_product_4}:
     uom_id: product_uom_unit
-    categ_id: product_category_9
+    categ_id: product_category_4
 -
   !record {model: product.pricelist, id: customer_pricelist}:
     name: Customer Pricelist
diff --git a/addons/product/test/product_pricelist.yml b/addons/product/test/product_pricelist.yml
index 3f245450ebf..c736e51ffaf 100644
--- a/addons/product/test/product_pricelist.yml
+++ b/addons/product/test/product_pricelist.yml
@@ -25,7 +25,7 @@
 -
   !python {model: product.product}: |
     context.update({'quantity':5})
-    product = self.browse(cr, uid, ref("product_product_7"), context=context)
+    product = self.browse(cr, uid, ref("product_product_26"), context=context)
     assert product.price == product.lst_price-product.lst_price*(0.05), "Sell price is not correspond."
 -
   I check sale price of PC4.