Merge branch 'master' into v7

diff --git a/demo/point_of_sale.xml b/demo/point_of_sale.xml
index a4b2679..e8e590a 100644 (file)
--- a/demo/point_of_sale.xml
+++ b/demo/point_of_sale.xml
@@ -43,11 +43,5 @@
         <record id="product_second_hand_wheel" model="product.product">
             <field name="pos_categ_id" ref="pos_new_equipment"/>
         </record>
-        <record id="product_standard_member" model="product.product">
-            <field name="pos_categ_id" ref="point_of_sale.categ_others"/>
-        </record>
-        <record id="product_reduce_member" model="product.product">
-            <field name="pos_categ_id" ref="point_of_sale.categ_others"/>
-        </record>
     </data>
 </openerp>