diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index e1f6d24ddd7..3fa9053b3c1 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -28,7 +28,7 @@ Main Features
 * Allows the user to create an invoice automatically
 * Refund previous sales
     """,
-    'depends': ['sale_stock', 'barcodes'],
+    'depends': ['stock_account', 'barcodes'],
     'data': [
         'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/point_of_sale/data/point_of_sale_demo.xml b/addons/point_of_sale/data/point_of_sale_demo.xml
index cdeffcc5e78..174ca4edaf0 100644
--- a/addons/point_of_sale/data/point_of_sale_demo.xml
+++ b/addons/point_of_sale/data/point_of_sale_demo.xml
@@ -360,7 +360,6 @@
         <record id="product.consu_delivery_03" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.consu_delivery_02" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.consu_delivery_01" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
-        <record id="sale.advance_product_0" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.membership_0" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.membership_1" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
         <record id="product.membership_2" model="product.product"> <field name="available_in_pos" eval="False"/> </record>
diff --git a/addons/point_of_sale/views/res_partner_view.xml b/addons/point_of_sale/views/res_partner_view.xml
index ff69e133f12..efde03711ad 100644
--- a/addons/point_of_sale/views/res_partner_view.xml
+++ b/addons/point_of_sale/views/res_partner_view.xml
@@ -3,17 +3,17 @@
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">res.partner.pos.form.inherit</field>
             <field name="model">res.partner</field>
-            <field name="inherit_id" ref="sale.res_partner_view_buttons"/>
+            <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="groups_id" eval="[(4, ref('group_pos_user'))]"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='sale_order_count']" position="after">
+                <div name="button_box" position="inside">
                     <button class="oe_stat_button" type="action" name="%(point_of_sale.action_pos_pos_form)d" 
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}"
                         attrs="{'invisible': ['|', ('customer', '=', False), ('pos_order_count', '=', 0)]}"
                         icon="fa-shopping-bag">
                         <field string="POS Sales" name="pos_order_count" widget="statinfo"/>
                     </button>
-                </xpath>
+                </div>
                 <xpath expr="//page[@name='sales_purchases']/group">
                     <group string="Point of Sale" name="point_of_sale">
                         <field name="barcode" />
@@ -24,12 +24,12 @@
         <record id="view_partner_pos_kanban" model="ir.ui.view">
             <field name="name">res.partner.pos.kanban.inherit</field>
             <field name="model">res.partner</field>
-            <field name="inherit_id" ref="sale.crm_lead_partner_kanban_view"/>
+            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
             <field name="groups_id" eval="[(4, ref('group_pos_user'))]"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='sale_order_count']" position="after">
+                <field name="state_id" position="before">
                     <field name="pos_order_count"/>
-                </xpath>
+                </field>
                 <xpath expr="//div[@class='oe_kanban_partner_links']" position="inside">
                     <span t-if="record.pos_order_count.value>0" class="badge"><i class="fa fa-fw fa-shopping-bag"/><t t-esc="record.pos_order_count.value"/></span>
                 </xpath>