diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 38ce1c77342..ef555ed8ae1 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -6,22 +6,10 @@
         <record id='base.res_partner_2'  model='res.partner'> <field name='barcode'>0420200000004</field> </record>
         <record id='base.res_partner_3'  model='res.partner'> <field name='barcode'>0420300000003</field> </record>
         <record id='base.res_partner_4'  model='res.partner'> <field name='barcode'>0420400000002</field> </record>
-        <record id='base.res_partner_3'  model='res.partner'> <field name='barcode'>0420500000001</field> </record>
-        <record id='base.res_partner_1'  model='res.partner'> <field name='barcode'>0420600000000</field> </record>
         <record id='base.res_partner_4'  model='res.partner'> <field name='barcode'>0420700000009</field> </record>
-        <record id='base.res_partner_12'  model='res.partner'> <field name='barcode'>0420800000008</field> </record>
-        <record id='base.res_partner_12'  model='res.partner'> <field name='barcode'>0420900000007</field> </record>
         <record id='base.res_partner_10' model='res.partner'> <field name='barcode'>0421000000003</field> </record>
-        <record id='base.res_partner_3' model='res.partner'> <field name='barcode'>0421100000002</field> </record>
-        <record id='base.res_partner_12' model='res.partner'> <field name='barcode'>0421200000001</field> </record>
-        <record id='base.res_partner_2' model='res.partner'> <field name='barcode'>0421300000000</field> </record>
-        <record id='base.res_partner_4' model='res.partner'> <field name='barcode'>0421400000009</field> </record>
-        <record id='base.res_partner_3' model='res.partner'> <field name='barcode'>0421500000008</field> </record>
-        <record id='base.res_partner_1' model='res.partner'> <field name='barcode'>0421600000007</field> </record>
-        <record id='base.res_partner_12' model='res.partner'> <field name='barcode'>0421700000006</field> </record>
+        <record id='base.res_partner_12'  model='res.partner'> <field name='barcode'>0420800000008</field> </record>
         <record id='base.res_partner_18' model='res.partner'> <field name='barcode'>0421800000005</field> </record>
-        <record id='base.res_partner_2' model='res.partner'> <field name='barcode'>0421900000004</field> </record>
-        <record id='base.res_partner_4' model='res.partner'> <field name='barcode'>0422100000009</field> </record>
 
         <record id="base.user_root" model="res.users">
             <field name="barcode">0410100000006</field>
@@ -37,39 +25,27 @@
           <field name="name">Beverages</field>
           <field name="image" type="base64" file="point_of_sale/static/img/beverage-image.jpg"/>
         </record>
-
-        <record id="water" model="pos.category">
+        <record id="soft" model="pos.category">
           <field name="parent_id" ref="beverage"/>
-          <field name="name">Water</field>
+          <field name="name">Soft</field>
           <field name="image" type="base64" file="point_of_sale/static/img/water-image.jpg"/>
         </record>
-        <record id="soda" model="pos.category">
+        <record id="alcohol" model="pos.category">
           <field name="parent_id" ref="beverage"/>
-          <field name="name">Soda</field>
-          <field name="image" type="base64" file="point_of_sale/static/img/soda-image.jpg"/>
-        </record>
-        <record id="beers" model="pos.category">
-          <field name="parent_id" ref="beverage"/>
-          <field name="name">Beers</field>
+          <field name="name">Alcohol</field>
           <field name="image" type="base64" file="point_of_sale/static/img/beers-image.jpg"/>
         </record>
-        <record id="partner_services" model="pos.category">
-          <field name="name">Partner Services</field>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/services.jpg"/>
-        </record>
-        <record id="partner_services" model="pos.category">
-          <field name="name">Partner Services</field>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/services.jpg"/>
-        </record>
-        <record id="fruits" model="pos.category">
-          <field name="name">Fruits</field>
+        <record id="fruits_vegetables" model="pos.category">
+          <field name="name">Fruits and Vegetables</field>
           <field name="image" type="base64" file="point_of_sale/static/img/fruits-image.jpg"/>
         </record>
-        <record id="vegetables" model="pos.category">
-          <field name="name">Vegetables</field>
-          <field name="image" type="base64" file="point_of_sale/static/img/legumes-image.jpg"/>
+
+        <record id="partner_services" model="pos.category">
+          <field name="name">Partner Services</field>
+          <field name="image" type="base64" file="point_of_sale/static/img/partners/services.jpg"/>
         </record>
 
+
         <!-- Resource: product.product -->
         <record id="boni_orange" model="product.product">
           <field name="available_in_pos">True</field>
@@ -77,7 +53,7 @@
           <field name="name">Boni Oranges</field>
           <field name="to_weight">True</field>
           <field name="barcode">2100002000003</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/boni_orange-image.jpg"/>
@@ -86,7 +62,7 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">2.83</field>
           <field name="name">Orange Butterfly</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="to_weight">True</field>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
@@ -99,7 +75,7 @@
           <field name="name">Lemon</field>
           <field name="barcode">2301000000006</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/citron-image.jpg"/>
@@ -109,7 +85,7 @@
           <field name="list_price">3.19</field>
           <field name="name">Stringers</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/limon-image.jpg"/>
@@ -119,7 +95,7 @@
           <field name="list_price">1.98</field>
           <field name="name">Red grapefruit</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pamplemousse_rouge_pamplemousse-image.jpg"/>
@@ -130,7 +106,7 @@
           <field name="list_price">2.09</field>
           <field name="name">Granny Smith apples</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pomme_granny_smith-image.jpg"/>
@@ -140,7 +116,7 @@
           <field name="list_price">1.10</field>
           <field name="name">Jonagold apples</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pomme_jonagold-image.jpg"/>
@@ -150,7 +126,7 @@
           <field name="list_price">1.69</field>
           <field name="name">Golden Apples Perlim</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pomme_golden_perlim-image.jpg"/>
@@ -161,29 +137,19 @@
           <field name="list_price">1.70</field>
           <field name="name">Conference pears</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poire_conference-image.jpg"/>
         </record>
 
-        <record id="nectarine" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">5.70</field>
-          <field name="name">Peach</field>
-          <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="fruits"/>
-          <field name="uom_id" ref="product.product_uom_kgm" />
-          <field name="uom_po_id" ref="product.product_uom_kgm" />
-          <field name="image" type="base64" file="point_of_sale/static/img/nectarine-image.jpg"/>
-        </record>
         <record id="peche" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">5.10</field>
           <field name="name">Peaches</field>
           <field name="to_weight">True</field>
           <field name="barcode">2300001000008</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/peche-image.jpg"/>
@@ -194,7 +160,7 @@
           <field name="list_price">4.80</field>
           <field name="name">Black Grapes</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="fruits"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/raisins-image.jpg"/>
@@ -205,7 +171,7 @@
           <field name="list_price">1.39</field>
           <field name="name">Potatoes</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/pomme_de_terre-image.jpg"/>
@@ -216,7 +182,7 @@
           <field name="list_price">2.20</field>
           <field name="name">Extra Flandria chicory</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/chicon_flandria_extra-image.jpg"/>
@@ -226,28 +192,18 @@
           <field name="list_price">0.90</field>
           <field name="name">Carrots</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/carotte-image.jpg"/>
         </record>
-        <record id="fenouil_fenouil" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">2.10</field>
-          <field name="name">Fennel</field>
-          <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
-          <field name="uom_id" ref="product.product_uom_kgm" />
-          <field name="uom_po_id" ref="product.product_uom_kgm" />
-          <field name="image" type="base64" file="point_of_sale/static/img/fenouil_fenouil-image.jpg"/>
-        </record>
 
         <record id="tomate_en_grappe" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.90</field>
           <field name="name">In Cluster Tomatoes</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/tomate_en_grappe-image.jpg"/>
@@ -259,7 +215,7 @@
           <field name="name">Onions</field>
           <field name="to_weight">True</field>
           <field name="barcode">2100001000004</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/Onions-image.jpg"/>
@@ -270,7 +226,7 @@
           <field name="list_price">3.10</field>
           <field name="name">Red Pepper</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poivron_rouges-image.jpg"/>
@@ -280,7 +236,7 @@
           <field name="list_price">3.00</field>
           <field name="name">Green Peppers</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poivron_verts-image.jpg"/>
@@ -290,7 +246,7 @@
           <field name="list_price">2.70</field>
           <field name="name">Yellow Peppers</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poivron_jaunes-image.jpg"/>
@@ -300,7 +256,7 @@
           <field name="list_price">2.29</field>
           <field name="name">Leeks</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/poireaux_poireaux-image.jpg"/>
@@ -310,7 +266,7 @@
           <field name="list_price">1.20</field>
           <field name="name">Zucchini</field>
           <field name="to_weight">True</field>
-          <field name="pos_categ_id" ref="vegetables"/>
+          <field name="pos_categ_id" ref="fruits_vegetables"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
           <field name="uom_po_id" ref="product.product_uom_kgm" />
           <field name="image" type="base64" file="point_of_sale/static/img/courgette-image.jpg"/>
@@ -320,7 +276,7 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">0.97</field>
           <field name="name">Coca-Cola Regular 50cl</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_50cl-image.jpg"/>
         </record>
         <record id="coca_regular_33cl" model="product.product">
@@ -328,7 +284,7 @@
           <field name="list_price">0.51</field>
           <field name="name">Coca-Cola Regular 33cl</field>
           <field name="barcode">5449000000996</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_33cl-image.jpg"/>
         </record>
 
@@ -336,14 +292,14 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">0.97</field>
           <field name="name">Coca-Cola Light 50cl</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_50cl-image.jpg"/>
         </record>
         <record id="coca_light_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.51</field>
           <field name="name">Coca-Cola Light 33cl</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_33cl-image.jpg"/>
         </record>
 
@@ -351,85 +307,42 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">2.83</field>
           <field name="name">Coca-Cola Light Lemon 2L</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/coca_light_lemon_2l-image.jpg"/>
         </record>
-        <record id="pepsi_33cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">0.43</field>
-          <field name="name">Pepsi 33cl</field>
-          <field name="pos_categ_id" ref="soda"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/pepsi_33cl-image.jpg"/>
-        </record>
-        <record id="pepsi_max_33cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">0.40</field>
-          <field name="name">Pepsi Max 33cl</field>
-          <field name="pos_categ_id" ref="soda"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_33cl-image.jpg"/>
-        </record>
-        <record id="pepsi_max_50cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">0.61</field>
-          <field name="name">Pepsi Max 50cl</field>
-          <field name="pos_categ_id" ref="soda"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_50cl-image.jpg"/>
-        </record>
-
-        <record id="spa_et_fruit_50cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">0.75</field>
-          <field name="name">Spa Fruit and Orange 50cl</field>
-          <field name="pos_categ_id" ref="soda"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/spa_et_fruit_50cl-image.jpg"/>
-        </record>
-        <record id="orangina_33cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">0.72</field>
-          <field name="name">Orangina 33cl</field>
-          <field name="pos_categ_id" ref="soda"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/orangina_33cl-image.jpg"/>
-        </record>
-        <record id="orangina_1,5l" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">2.42</field>
-          <field name="name">Orangina 1.5L</field>
-          <field name="pos_categ_id" ref="soda"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/orangina_1,5l-image.jpg"/>
-        </record>
         <record id="fanta_orange_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.98</field>
           <field name="name">Fanta Orange 50cl</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_50cl-image.jpg"/>
         </record>
         <record id="fanta_orange_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.51</field>
           <field name="name">Fanta Orange 33cl</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_33cl-image.jpg"/>
         </record>
         <record id="fanta_orange_25cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.84</field>
           <field name="name">Fanta Orange 25cl</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_25cl-image.jpg"/>
         </record>
         <record id="fanta_zero_orange_1,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">2.08</field>
           <field name="name">Fanta Orange Zero 1.5L</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_zero_orange_1,5l-image.jpg"/>
         </record>
         <record id="fanta_zero_orange_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.53</field>
           <field name="name">Fanta Zero Orange 33cl</field>
-          <field name="pos_categ_id" ref="soda"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/fanta_zero_orange_33cl-image.jpg"/>
         </record>
 
@@ -437,49 +350,35 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">0.52</field>
           <field name="name">Evian 50cl</field>
-          <field name="pos_categ_id" ref="water"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/evian_50cl-image.jpg"/>
         </record>
         <record id="evian_2l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.26</field>
           <field name="name">2L Evian</field>
-          <field name="pos_categ_id" ref="water"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/evian_2l-image.jpg"/>
         </record>
-        <record id="spa_gazeuse_50cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">0.49</field>
-          <field name="name">Spa Barisart 50cl</field>
-          <field name="pos_categ_id" ref="water"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/spa_gazeuse_50cl-image.jpg"/>
-        </record>
-        <record id="spa_gazeuse_1,5l" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">1.00</field>
-          <field name="name">Spa Barisart 1.5l</field>
-          <field name="pos_categ_id" ref="water"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/spa_gazeuse_1,5l-image.jpg"/>
-        </record>
         <record id="chaudfontaine_petillante_1,5l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.98</field>
           <field name="name">Chaudfontaine Petillante 1.5l</field>
-          <field name="pos_categ_id" ref="water"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_petillante_1,5l-image.jpg"/>
         </record>
         <record id="perrier_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.71</field>
           <field name="name">50cl Perrier</field>
-          <field name="pos_categ_id" ref="water"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/perrier_50cl-image.jpg"/>
         </record>
         <record id="san_pellegrino_1l" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.98</field>
           <field name="name">San Pellegrino 1L</field>
-          <field name="pos_categ_id" ref="water"/>
+          <field name="pos_categ_id" ref="soft"/>
           <field name="image" type="base64" file="point_of_sale/static/img/san_pellegrino_1l-image.jpg"/>
         </record>
 
@@ -487,57 +386,35 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">1.19</field>
           <field name="name">Stella Artois 50cl</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/stella_50cl-image.jpg"/>
         </record>
         <record id="stella_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.82</field>
           <field name="name">Stella Artois 33cl</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/stella_33cl-image.jpg"/>
         </record>
-        <record id="jupiler_50cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">0.97</field>
-          <field name="name">Jupiler 50cl</field>
-          <field name="pos_categ_id" ref="beers"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/jupiler_50cl-image.jpg"/>
-        </record>
-        <record id="jupiler_33cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">0.77</field>
-          <field name="barcode">5410228142027</field>
-          <field name="name">Jupiler 33cl</field>
-          <field name="pos_categ_id" ref="beers"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/jupiler_33cl-image.jpg"/>
-        </record>
         <record id="timmermans_kriek_37,5cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.7</field>
           <field name="name">Timmermans Kriek 37.5cl</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/timmermans_kriek_37,5cl-image.jpg"/>
         </record>
-        <record id="lindemans_pecheresse_37,,5cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">1.94</field>
-          <field name="name">Lindemans sinful 37.5cl</field>
-          <field name="pos_categ_id" ref="beers"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/lindemans_pecheresse_37,,5cl-image.jpg"/>
-        </record>
         <record id="lindemans_kriek_37,5cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.51</field>
           <field name="name">Lindemans Kriek 37.5cl</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/lindemans_kriek_37,5cl-image.jpg"/>
         </record>
         <record id="grisette_cerise_25cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.04</field>
           <field name="name">Grisette Cherry 25cl</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/grisette_cerise_25cl-image.jpg"/>
         </record>
         <record id="belle_vue_kriek_25cl" model="product.product">
@@ -545,7 +422,7 @@
           <field name="list_price">0.83</field>
           <field name="name">Belle-Vue Kriek 25cl</field>
           <field name='barcode'>5410228193449</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/belle_vue_kriek_25cl-image.jpg"/>
         </record>
 
@@ -554,7 +431,7 @@
           <field name="list_price">1.00</field>
           <field name="name">Leffe Brune 33cl</field>
           <field name='barcode'>5410228142164</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/leffe_brune_33cl-image.jpg"/>
         </record>
         <record id="leffe_blonde_33cl" model="product.product">
@@ -562,42 +439,28 @@
           <field name="list_price">1.00</field>
           <field name="name">Leffe Blonde 33cl</field>
           <field name='barcode'>5410228142218</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/leffe_blonde_33cl-image.jpg"/>
         </record>
-        <record id="leffe_9_33cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">1.16</field>
-          <field name="name">Leffe Brune "9" 33cl</field>
-          <field name="pos_categ_id" ref="beers"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/leffe_9_33cl-image.jpg"/>
-        </record>
         <record id="orval_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.59</field>
           <field name="name">Orval 33cl</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/orval_33cl-image.jpg"/>
         </record>
         <record id="rochefort_8_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.75</field>
           <field name="name">Rochefort "8" 33cl</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/rochefort_8_33cl-image.jpg"/>
         </record>
-        <record id="chimay_bleu_33cl" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">1.46</field>
-          <field name="name">Chimay Bleu 33cl</field>
-          <field name="pos_categ_id" ref="beers"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/chimay_bleu_33cl-image.jpg"/>
-        </record>
         <record id="chimay_rouge_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">1.02</field>
           <field name="name">Chimay Red 33cl</field>
-          <field name="pos_categ_id" ref="beers"/>
+          <field name="pos_categ_id" ref="alcohol"/>
           <field name="image" type="base64" file="point_of_sale/static/img/chimay_rouge_33cl-image.jpg"/>
         </record>
 
@@ -608,24 +471,6 @@
             <field name="available_in_pos" eval="False"/> 
         </record>
 
-        <record id="partner_product_1" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">850.00</field>
-          <field name="name">Odoo Start Workshop</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/openbig.jpg"/>
-        </record>
-
-        <record id="partner_product_2" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">999.99</field>
-          <field name="name">Odoo Consulting</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/bhc.jpg"/>
-        </record>
-
         <record id="partner_product_3" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">999.99</field>
@@ -688,142 +533,6 @@
           <field name="image" type="base64" file="point_of_sale/static/img/partners/eggs-solutions.jpg"/>
         </record>
 
-        <record id="partner_product_10" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">3500.00</field>
-          <field name="name">Odoo primary scoping &amp; analysis package (£900, £450, £30)</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/opusvl.png"/>
-        </record>
-
-        <record id="partner_product_11" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">900.00</field>
-          <field name="name">3rd party system analysis</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/opusvl.png"/>
-        </record>
-
-        <record id="partner_product_12" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">30.00</field>
-          <field name="name">Odoo enterprise agreement</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/opusvl.png"/>
-        </record>
-
-        <record id="partner_product_1" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">850.00</field>
-          <field name="name">Odoo Start Workshop</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/openbig.jpg"/>
-        </record>
-
-        <record id="partner_product_2" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">999.99</field>
-          <field name="name">Odoo Consulting</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/bhc.jpg"/>
-        </record>
-
-        <record id="partner_product_3" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">999.99</field>
-          <field name="name">Eezee-It</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/eezee-it.png"/>
-        </record>
-
-        <record id="partner_product_4" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">999.99</field>
-          <field name="name">Ekomurz.nl</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/ekomurz.gif"/>
-        </record>
-
-        <record id="partner_product_5" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">999.99</field>
-          <field name="name">Acsone.eu</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/acsone.png"/>
-        </record>
-
-        <record id="partner_product_6" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">999.99</field>
-          <field name="name">Vauxoo.com</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/vauxoo.png"/>
-        </record>
-
-        <record id="partner_product_7" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">999.99</field>
-          <field name="name">Datalp.com</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/datalp.jpg"/>
-        </record>
-
-        <record id="partner_product_8" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">999.99</field>
-          <field name="name">camptocamp.com</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/camptocamp.png"/>
-        </record>
-
-        <record id="partner_product_9" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">999.99</field>
-          <field name="name">EGGS-solutions.fr</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/eggs-solutions.jpg"/>
-        </record>
-
-        <record id="partner_product_10" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">3500.00</field>
-          <field name="name">Odoo primary scoping &amp; analysis package (£900, £450, £30)</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/opusvl.png"/>
-        </record>
-
-        <record id="partner_product_11" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">900.00</field>
-          <field name="name">3rd party system analysis</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/opusvl.png"/>
-        </record>
-
-        <record id="partner_product_12" model="product.product">
-          <field name="available_in_pos">True</field>
-          <field name="list_price">30.00</field>
-          <field name="name">Odoo enterprise agreement</field>
-          <field name="type">service</field>
-          <field name="pos_categ_id" ref="partner_services"/>
-          <field name="image" type="base64" file="point_of_sale/static/img/partners/opusvl.png"/>
-        </record>
-
-
-        
         <!-- The electronic products shouldn't be present in the point of sale for the demo -->
 
         <record id="product.product_product_1" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
@@ -886,6 +595,9 @@
         <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="sale.advance_product_0" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
+
+
 
     </data>
 </openerp>