[IMP] base,*: Improve the res.partner form view UX

Purpose
=======

The Contact form is one of the most used/important view. It is quite
important to find the piece of information easily and to navigate in
a few clicks to the related views.

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

Stat buttons
------------

- Restructure stat buttons with the following order:
Opportunities  -> sales user
Meetings    -> sales users
Sales    -> Sales users
POS Sales -> pos users
Subscriptions   -> Subscription users
Events    -> event user
Tasks -> project user
TIckets -> helpdesk user
Purchases   -> purchase user
Due -> billing: user
Invoiced     -> billing: user
Vendor Bills -> billing: user
Customer/Vendor Partner Ledger -> accounting: billing
Analytic Accounts -> accounting: billing
Credit Cards -> sales user
Direct Debit Mandates -> accounting: billing user
Publish
- Use better/more relevant icons
- Check that the proper access rights are set
- Remove the bank accounts stat buttons and replace it by a one2many
  tree on the Invoicing page.

Fields
------

Move some res.partner fields from the "Accouting" page to the
"sale & Purchase" page:
- Fiscal positions
- Payment terms

Miscellaneous
-------------

- Remove dead code.
- Display nothing instead "Please complete customer's informations and email"
  on the popup when sending an email to a contact without email address.

25 files changed, 99 insertions, 130 deletions

diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py
index 75d74a2cbc0..ac2e82fcdb5 100644
--- a/addons/account/models/partner.py
+++ b/addons/account/models/partner.py
@@ -399,8 +399,8 @@ class ResPartner(models.Model):
         string='Customer Payment Terms',
         help="This payment term will be used instead of the default one for sales orders and customer invoices", oldname="property_payment_term")
     property_supplier_payment_term_id = fields.Many2one('account.payment.term', company_dependent=True,
-         string='Vendor Payment Terms',
-         help="This payment term will be used instead of the default one for purchase orders and vendor bills", oldname="property_supplier_payment_term")
+        string='Vendor Payment Terms',
+        help="This payment term will be used instead of the default one for purchase orders and vendor bills", oldname="property_supplier_payment_term")
     ref_company_ids = fields.One2many('res.company', 'partner_id',
         string='Companies that refers to partner', oldname="ref_companies")
     has_unreconciled_entries = fields.Boolean(compute='_compute_has_unreconciled_entries',
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index fea86d8c1ff..370176ba32e 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -122,14 +122,5 @@
 
     <menuitem name="Invoices" action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.account_reports_management_menu" sequence="18"/>
 
-    <act_window
-        id="act_account_invoice_partner_relation"
-        name="Monthly Turnover"
-        groups="account.group_account_manager"
-        context="{'search_default_partner_id':[active_id], 'search_default_month':1,'search_default_user':1,'group_by_no_leaf':1,'group_by':[]}"
-        res_model="account.invoice.report"
-        src_model="res.partner"
-        view_mode="graph"/>
-
 </data>
 </odoo>
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 56bade5ea3b..d96dcd3a76c 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -168,13 +168,6 @@
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu" groups="account.group_account_user" sequence="0"/>
 
         <act_window
-            id="account.action_all_partner_invoices"
-            name="All Invoices"
-            res_model="account.invoice"
-            domain="[('partner_id', 'child_of', active_id)]"
-            src_model="res.partner"/>
-
-        <act_window
             id="act_account_acount_move_line_open_unreconciled"
             name="Unreconciled Entries"
             res_model="account.move.line"
@@ -205,8 +198,7 @@
             id="action_move_line_select_by_partner"
             name="Journal Items"
             context="{'search_default_partner_id': [active_id]}"
-            res_model="account.move.line"
-            src_model="res.partner"/>
+            res_model="account.move.line"/>
 
         <!-- Account Journal -->
         <record id="view_account_journal_tree" model="ir.ui.view">
diff --git a/addons/account/views/partner_view.xml b/addons/account/views/partner_view.xml
index aa05415c852..730f62e1fad 100644
--- a/addons/account/views/partner_view.xml
+++ b/addons/account/views/partner_view.xml
@@ -120,10 +120,10 @@
             <field name="name">partner.view.buttons</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="20"/>
+            <field name="priority" eval="11"/>
             <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button type="object" class="oe_stat_button" icon="fa-pencil-square-o" name="action_view_partner_invoices"
                         attrs="{'invisible': [('customer', '=', False)]}" context="{'default_partner_id': active_id}">
                         <div class="o_form_field o_stat_info">
@@ -133,20 +133,8 @@
                             <span class="o_stat_text">Invoiced</span>
                         </div>
                     </button>
-                </div>
-                <group name="container_row_2" position="inside">
-                    <group string="Payments" name="banks">
-                        <field name="currency_id" invisible="1"/>
-                        <div>
-                            <button type="action" class="btn-link"
-                                name="%(base.action_res_partner_bank_account_form)d"
-                                context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}">
-                                <field string="Bank account(s)" name="bank_account_count" widget="statinfo"/>
-                            </button>
-                        </div>
+                </button>
 
-                    </group>
-                </group>
                 <page name="internal_notes" position="inside">
                     <group colspan="2" col="2" groups="account.group_warning_account">
                         <separator string="Warning on the Invoice" colspan="4"/>
@@ -162,12 +150,13 @@
             <field name="name">partner.view.button.contracts_count</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="22"/>
+            <field name="priority" eval="14"/>
             <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml">
                 <button name="toggle_active" position="before">
                     <button class="oe_stat_button" type="action" name="%(account.action_open_partner_analytic_accounts)d"
-                        icon="fa-book" groups="analytic.group_analytic_accounting">
+                        groups="account.group_account_invoice"
+                        icon="fa-book" title="Analytic Accounts">
                         <field string="Analytic Accounts" name="contracts_count" widget="statinfo"/>
                     </button>
                 </button>
@@ -201,34 +190,42 @@
             <field name="model">res.partner</field>
             <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml">
                 <page name="sales_purchases" position="after">
-                <page string="Invoicing" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
-                    <group>
-                        <group string="Sale" name="acc_sale">
-                            <field name="property_payment_term_id" widget="selection"/>
-                            <field name="trust" groups="base.group_no_one"/>
-                        </group>
-                        <group string="Purchase" name="acc_purchase">
-                            <field name="property_supplier_payment_term_id" widget="selection"/>
-                            <field name="currency_id" invisible="1"/>
+                    <page string="Invoicing" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}" groups="account.group_account_invoice">
+                        <group>                    
+                            <group string="Bank Accounts" name="banks" groups="account.group_account_invoice">
+                                <field name="bank_ids" nolabel="1">
+                                    <tree editable="bottom">
+                                        <field name="bank_id"/>
+                                        <field name="acc_number"/>
+                                    </tree>
+                                </field>
+                            </group>
+                            <group string="Accounting Entries" name="accounting_entries" groups="account.group_account_user">
+                                <field name="currency_id" invisible="1"/>
+                                <field name="property_account_receivable_id"/>
+                                <field name="property_account_payable_id"/>
+                            </group>
                         </group>
-                        <group string="Fiscal Information" name="fiscal_information">
-                            <field name="property_account_position_id" options="{'no_create': True, 'no_open': True}"/>
-                        </group>
-                        <group string="Accounting Entries" name="accounting_entries" groups="account.group_account_user">
-                            <field name="property_account_receivable_id"/>
-                            <field name="property_account_payable_id"/>
-                        </group>
-                    </group>
-                </page>
-                <page string="Invoicing" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
-                    <div>
-                        <p>Accounting-related settings are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
-                    </div>
-                </page>
+                    </page>
+                    <page string="Invoicing" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}" groups="account.group_account_invoice">
+                        <div>
+                            <p>Accounting-related settings are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
+                        </div>
+                    </page>
                 </page>
+                <xpath expr="//page[@name='sales_purchases']/group" position="inside">
+                    <group string="Fiscal Information" name="fiscal_information" priority="5" groups="account.group_account_invoice, sales_team.group_sale_salesman">
+                        <field name="property_account_position_id" options="{'no_create': True, 'no_open': True}"/>
+                    </group>
+                </xpath>
+                <group name="sale" position="inside">
+                    <field string="Payment Terms" name="property_payment_term_id" widget="selection" groups="account.group_account_invoice, sales_team.group_sale_salesman"/>
+                </group>
+                <group name="purchase" position="inside">
+                    <field string="Payment Terms" name="property_supplier_payment_term_id" widget="selection" groups="account.group_account_invoice, sales_team.group_sale_salesman"/>
+                </group>
             </field>
         </record>
     </data>
diff --git a/addons/account_analytic_default/views/account_analytic_default_view.xml b/addons/account_analytic_default/views/account_analytic_default_view.xml
index bc4e2a0bf39..e964c4e0f0a 100644
--- a/addons/account_analytic_default/views/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/views/account_analytic_default_view.xml
@@ -108,15 +108,6 @@
             action="action_analytic_default_list"
             parent="account.menu_analytic_accounting"/>
 
-
-        <act_window
-            name="Analytic Rules"
-            id="analytic_rule_action_partner"
-            res_model="account.analytic.default"
-            src_model="res.partner"
-            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
-            groups="analytic.group_analytic_accounting"/>
-
         <act_window
             name="Analytic Rules"
             id="analytic_rule_action_user"
diff --git a/addons/crm/views/res_partner_views.xml b/addons/crm/views/res_partner_views.xml
index d92ec1a6634..6e6288ce1c9 100644
--- a/addons/crm/views/res_partner_views.xml
+++ b/addons/crm/views/res_partner_views.xml
@@ -94,7 +94,7 @@
             <field name="name">view.res.partner.form.crm.inherited1</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
-            <field eval="18" name="priority"/>
+            <field eval="1" name="priority"/>
             <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
             <field name="arch" type="xml">
                 <data>
@@ -103,12 +103,14 @@
                             attrs="{'invisible': [('customer', '=', False)]}"
                             name="%(crm.crm_lead_opportunities)d"
                             icon="fa-star"
+                            groups="sales_team.group_sale_salesman"
                             context="{'search_default_partner_id': active_id}">
                             <field string="Opportunities" name="opportunity_count" widget="statinfo"/>
                         </button>
                         <button class="oe_stat_button" type="object"
                             name="schedule_meeting"
                             icon="fa-calendar"
+                            groups="sales_team.group_sale_salesman"
                             context="{'partner_id': active_id, 'partner_name': name}">
                             <field string="Meetings" name="meeting_count" widget="statinfo"/>
                         </button>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 935d486306f..87c51f7f92f 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -418,15 +418,6 @@
             </field>
         </record>
 
-        <act_window
-            id="act_register_event_partner"
-            name="Subscribe"
-            res_model="event.registration"
-            src_model="res.partner"
-            view_mode="tree,form,calendar,graph"
-            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
-            view_type="form"/>
-
         <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="event.event_main_menu" />
         <menuitem name="Events"
             id="event_event_menu_pivot_report"
diff --git a/addons/event/views/res_partner_views.xml b/addons/event/views/res_partner_views.xml
index 22aeba8686a..01f3b00efc5 100644
--- a/addons/event/views/res_partner_views.xml
+++ b/addons/event/views/res_partner_views.xml
@@ -5,17 +5,17 @@
             <field name="name">view.res.partner.form.event.inherited</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
+            <field name="priority" eval="6"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button"
+                        groups="event.group_event_user"
                         type="object"
                         icon="fa-ticket"
-                        groups="event.group_event_user"
                         name="action_event_view" attrs="{'invisible': [('event_count','=', 0)]}">
                         <field string="Events" name="event_count" widget="statinfo"/>
                     </button>
-                </div>
+                </button>
             </field>
         </record>
     </data>
diff --git a/addons/mail/static/src/js/many2many_tags_email.js b/addons/mail/static/src/js/many2many_tags_email.js
index a16a424fe92..e66412a7a2c 100644
--- a/addons/mail/static/src/js/many2many_tags_email.js
+++ b/addons/mail/static/src/js/many2many_tags_email.js
@@ -82,7 +82,7 @@ var FieldMany2ManyTagsEmail = M2MTags.extend({
                 res_model: self.field.relation,
                 res_id: resID,
                 context: self.record.context,
-                title: _t("Please complete customer's informations and email"),
+                title: "",
                 on_saved: function (record) {
                     if (record.data.email) {
                         validPartners.push(record.res_id);
diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml
index 0264859b615..8a5cafad3da 100644
--- a/addons/mail/views/res_partner_views.xml
+++ b/addons/mail/views/res_partner_views.xml
@@ -28,10 +28,6 @@
             <field name="arch" type="xml">
                     <filter name="supplier" position="after">
                         <separator />
-                        <filter string="Available for mass mailing"
-                                name='not_opt_out' domain="[('opt_out', '=', False)]"
-                                help="Partners that did not ask not to be included in mass mailing campaigns" />
-                        <separator/>
                         <filter string="My Activities" name="activities_my"
                                 domain="[('activity_ids.user_id', '=', uid)]"/>
                         <separator/>
@@ -58,7 +54,7 @@
         </record>
 
         <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
-        <act_window name="Partner Mass Mailing"
+        <act_window name="Send Email"
                 res_model="mail.compose.message"
                 src_model="res.partner"
                 view_mode="form"
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 45aa65256b4..5d3a7a910dd 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -96,7 +96,7 @@
         </record>
 
         <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
-        <act_window name="Partner Mass Mailing"
+        <act_window name="Send Email"
                 res_model="mail.compose.message"
                 src_model="res.partner"
                 view_mode="form"
diff --git a/addons/payment/models/res_partner.py b/addons/payment/models/res_partner.py
index ef97997c267..b24dba39198 100644
--- a/addons/payment/models/res_partner.py
+++ b/addons/payment/models/res_partner.py
@@ -8,8 +8,7 @@ class res_partner(models.Model):
     _inherit = 'res.partner'
 
     payment_token_ids = fields.One2many('payment.token', 'partner_id', 'Payment Tokens')
-    payment_token_count = fields.Integer(
-        'Count Payment Token', compute='_compute_payment_token_count')
+    payment_token_count = fields.Integer('Count Payment Token', compute='_compute_payment_token_count')
 
     @api.depends('payment_token_ids')
     def _compute_payment_token_count(self):
diff --git a/addons/payment/views/res_partner_views.xml b/addons/payment/views/res_partner_views.xml
index 4708fec0c5e..8e546752382 100644
--- a/addons/payment/views/res_partner_views.xml
+++ b/addons/payment/views/res_partner_views.xml
@@ -6,15 +6,23 @@
         <record id="view_partners_form_payment_defaultcreditcard" model="ir.ui.view">
                 <field name="name">view.res.partner.form.payment.defaultcreditcard</field>
                 <field name="model">res.partner</field>
-                <field name="inherit_id" ref="account.partner_view_buttons"/>
+                <field name="inherit_id" ref="base.view_partner_form"/>
+                <field name="priority" eval="15"/>
                 <field name="arch" type="xml">
-                    <xpath expr='//group[@name="banks"]' position="inside">
-                        <button type="action" class="btn-link"
-                            name="%(payment.payment_token_action)d"
-                            context="{'search_default_partner_id': active_id}">
-                            <field name="payment_token_count" widget="statinfo" string="Credit card(s)"/>
+                    <button name="toggle_active" position="before">
+                        <button type="action" class="oe_stat_button"
+                                icon="fa-credit-card"
+                                name="%(payment.payment_token_action)d"
+                                groups="sales_team.group_sale_salesman"
+                                context="{'search_default_partner_id': active_id}">
+                            <div class="o_form_field o_stat_info">
+                                <span class="o_stat_value">
+                                    <field name="payment_token_count" widget="statinfo" nolabel="1"/>
+                                </span>
+                                <span class="o_stat_text">Credit card(s)</span>
+                            </div>
                         </button>
-                    </xpath>
+                    </button>
                 </field>
         </record>
     </data>
diff --git a/addons/point_of_sale/views/res_partner_view.xml b/addons/point_of_sale/views/res_partner_view.xml
index aca19bd1f10..ed09836a96e 100644
--- a/addons/point_of_sale/views/res_partner_view.xml
+++ b/addons/point_of_sale/views/res_partner_view.xml
@@ -4,16 +4,17 @@
             <field name="name">res.partner.pos.form.inherit</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="priority" eval="4"/>
             <field name="groups_id" eval="[(4, ref('group_pos_user'))]"/>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <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>
-                </div>
+                </button>
             </field>
         </record>
         <record id="view_partner_pos_kanban" model="ir.ui.view">
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 44eb1637619..6fa550a184f 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -27,7 +27,7 @@ class PortalWizard(models.TransientModel):
     """
 
     _name = 'portal.wizard'
-    _description = 'Portal Access Management'
+    _description = 'Grant Portal Access'
 
     def _default_user_ids(self):
         # for each partner, determine corresponding portal.wizard.user records
diff --git a/addons/portal/wizard/portal_wizard_views.xml b/addons/portal/wizard/portal_wizard_views.xml
index 5a234ea68ec..05896b77748 100644
--- a/addons/portal/wizard/portal_wizard_views.xml
+++ b/addons/portal/wizard/portal_wizard_views.xml
@@ -2,7 +2,7 @@
 <odoo>
         <!-- wizard action on res.partner -->
         <act_window id="partner_wizard_action"
-            name="Portal Access Management"
+            name="Grant Portal Access"
             src_model="res.partner"
             res_model="portal.wizard"
             view_type="form" view_mode="form"
@@ -11,10 +11,10 @@
 
         <!-- wizard view -->
         <record id="wizard_view" model="ir.ui.view">
-            <field name="name">Portal Access Management</field>
+            <field name="name">Grant Portal Access</field>
             <field name="model">portal.wizard</field>
             <field name="arch" type="xml">
-                <form string="Portal Access Management">
+                <form string="Grant Portal Access">
                     <div>
                         Select which contacts should belong to the portal in the list below.
                         The email address of each selected contact must be valid and unique.
diff --git a/addons/product/models/res_partner.py b/addons/product/models/res_partner.py
index d307bd6ab09..d18e4266378 100644
--- a/addons/product/models/res_partner.py
+++ b/addons/product/models/res_partner.py
@@ -9,7 +9,7 @@ class Partner(models.Model):
     _inherit = 'res.partner'
 
     property_product_pricelist = fields.Many2one(
-        'product.pricelist', 'Sale Pricelist', compute='_compute_product_pricelist',
+        'product.pricelist', 'Pricelist', compute='_compute_product_pricelist',
         inverse="_inverse_product_pricelist", company_dependent=False,  # NOT A REAL PROPERTY
         help="This pricelist will be used, instead of the default one, for sales to the current partner")
 
diff --git a/addons/project/views/res_partner_views.xml b/addons/project/views/res_partner_views.xml
index 34e59d2d3f4..f7a7314c002 100644
--- a/addons/project/views/res_partner_views.xml
+++ b/addons/project/views/res_partner_views.xml
@@ -6,7 +6,7 @@
             <field name="name">res.partner.task.buttons</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="priority" eval="50"/>
+            <field name="priority" eval="7"/>
             <field name="groups_id" eval="[(4, ref('project.group_project_user'))]"/>
             <field name="arch" type="xml">
                 <button name="toggle_active" position="before">
diff --git a/addons/purchase/views/res_partner_views.xml b/addons/purchase/views/res_partner_views.xml
index af6e9e01ba7..be6356fd001 100644
--- a/addons/purchase/views/res_partner_views.xml
+++ b/addons/purchase/views/res_partner_views.xml
@@ -70,11 +70,12 @@
             <field name="name">res.partner.view.purchase.buttons</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="20"/>
+            <field name="priority" eval="9"/>
             <field name="groups_id" eval="[(4, ref('purchase.group_purchase_user'))]"/>
             <field name="arch" type="xml">
                 <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
+                        groups="purchase.group_purchase_user"
                         attrs="{'invisible': [('supplier', '=', False)]}" icon="fa-shopping-cart">
                         <field string="Purchases" name="purchase_order_count" widget="statinfo"/>
                     </button>
@@ -94,7 +95,7 @@
             <field name="name">res.partner.view.purchase.account.buttons</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="20"/>
+            <field name="priority" eval="12"/>
             <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml">
                 <button name="toggle_active" position="before">
diff --git a/addons/sale/views/res_partner_views.xml b/addons/sale/views/res_partner_views.xml
index 53d5577fb46..e258e3f649d 100644
--- a/addons/sale/views/res_partner_views.xml
+++ b/addons/sale/views/res_partner_views.xml
@@ -37,11 +37,12 @@
             <field name="name">res.partner.view.buttons</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="20"/>
+            <field name="priority" eval="3"/>
             <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
             <field name="arch" type="xml">
                 <button name="toggle_active" position="before">
                     <button class="oe_stat_button" type="action" name="%(sale.act_res_partner_2_sale_order)d" 
+                        groups="sales_team.group_sale_salesman"
                         attrs="{'invisible': [('customer', '=', False)]}"
                         icon="fa-usd">
                         <field string="Sales" name="sale_order_count" widget="statinfo"/>
diff --git a/addons/stock/views/res_partner_views.xml b/addons/stock/views/res_partner_views.xml
index 9f9fcac402d..bd69fde7ba2 100644
--- a/addons/stock/views/res_partner_views.xml
+++ b/addons/stock/views/res_partner_views.xml
@@ -10,13 +10,13 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="mail.res_partner_view_form_inherit_mail"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='container_row_2']" position="after">
-                <group name="container_row_stock" groups="base.group_no_one">
-                    <group string="Warehouse" name="warehouse">
-                        <field name="property_stock_customer" domain="[('usage','=','customer')]"/>
-                        <field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
+            <xpath expr="//page[@name='sales_purchases']/group" position="inside">
+                    <group name="container_row_stock" groups="base.group_no_one" priority="6">
+                        <group string="Warehouse" name="warehouse">
+                            <field name="property_stock_customer" domain="[('usage','=','customer')]"/>
+                            <field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
+                        </group>
                     </group>
-                </group>
             </xpath>
         </field>
     </record>
diff --git a/addons/survey/wizard/survey_email_compose_message.xml b/addons/survey/wizard/survey_email_compose_message.xml
index 3ad78c4785d..baa4601b7ea 100644
--- a/addons/survey/wizard/survey_email_compose_message.xml
+++ b/addons/survey/wizard/survey_email_compose_message.xml
@@ -17,7 +17,6 @@
         </record>
 
         <!-- Replace the default mass-mailing wizard in base with the composition wizard -->
-        <act_window name="Partner Survey Mailing" res_model="survey.mail.compose.message" src_model="res.partner" view_mode="form" multi="True" target="new" key2="client_action_multi" id="survey.action_partner_survey_mail" context="{'default_use_template': True, 'default_template_id': ref('email_template_survey')}" />
 
         <!-- Composition form (context['survey_resent_token'], if True, hide share option, emails list and partner_ids) -->
         <record model="ir.ui.view" id="survey_email_compose_message">
diff --git a/addons/website_partner/views/res_partner_views.xml b/addons/website_partner/views/res_partner_views.xml
index a83efe74c21..53236bce708 100644
--- a/addons/website_partner/views/res_partner_views.xml
+++ b/addons/website_partner/views/res_partner_views.xml
@@ -4,7 +4,7 @@
         <field name="name">view.res.partner.form.website</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
-        <field eval="18" name="priority"/>
+        <field eval="17" name="priority"/>
         <field name="arch" type="xml">
             <data>
                 <button name="toggle_active" position="before">
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index f7657ccb475..5c352767de5 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo> 
     <data>
 
         <!-- Partner Titles -->
@@ -65,7 +65,7 @@
                     <field name="type" invisible="1"/>
                     <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium"}'/>
                     <div class="oe_title">
-                        <field name="company_type" options="{'horizontal': true}" class="oe_edit_only" widget="radio"/>
+                        <field name="company_type" options="{'horizontal': true}" class="oe_edit_only" widget="radio"  groups="base.group_no_one"/>
                         <h1>
                             <field name="name" default_focus="1" placeholder="Name" attrs="{'required' : [('type', '=', 'contact')]}"/>
                         </h1>
@@ -75,7 +75,7 @@
                             attrs="{'invisible': [('is_company','=', True)]}"/>
                     </div>
                     <group>
-                        <field name="function" placeholder="e.g. Sales Director"/>
+                        <field name="function" placeholder="e.g. Sales Director" attrs="{'invisible': [('is_company','=', True)]}"/>
                         <field name="user_ids" invisible="1"/>
                         <field name="email" widget="email" context="{'gravatar_image': True}" required="context.get('force_email', False)" attrs="{'required': [('user_ids','!=', [])]}"/>
                         <field name="phone" widget="phone"/>
@@ -191,7 +191,7 @@
         <record id="view_partner_form" model="ir.ui.view">
             <field name="name">res.partner.form</field>
             <field name="model">res.partner</field>
-            <field name="priority" eval="1"/>
+            <field name="priority" eval="18"/>
             <field name="arch" type="xml">
                 <form string="Partners">
                 <sheet>
@@ -245,8 +245,7 @@
                                     attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
                             </div>
                             <field name="vat" placeholder="e.g. BE0477472701" attrs="{'readonly': [('parent_id','!=',False)]}"/>
-                            <field name="category_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Tags..."/>
-                        </group>
+                           </group>
                         <group>
                             <field name="function" placeholder="e.g. Sales Director"
                                 attrs="{'invisible': [('is_company','=', True)]}"/>
@@ -258,6 +257,7 @@
                             <field name="title" options='{"no_open": True}'
                                 attrs="{'invisible': [('is_company', '=', True)]}"/>
                             <field name="lang"/>
+                            <field name="category_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Tags..."/>
                         </group>
                     </group>
 
@@ -371,11 +371,11 @@
                         </page>
                         <page name='sales_purchases' string="Sales &amp; Purchases">
                             <group name="container_row_2">
-                                <group string="Sale" name="sale">
+                                <group string="Sales" name="sale" priority="1">
                                     <field name="customer"/>
                                     <field name="user_id"/>
                                 </group>
-                                <group string="Purchase" name="purchase">
+                                <group string="Purchase" name="purchase" priority="2">
                                     <field name="supplier"/>
                                 </group>
                                 <group string="Misc">
@@ -443,10 +443,10 @@
                 <search string="Search Partner">
                    <field name="name"
                        filter_domain="['|','|',('display_name','ilike',self),('ref','=',self),('email','ilike',self)]"/>
-                   <filter name="filter_my_partners" help="My Partners"
+                   <filter name="filter_my_partners" help="My Contacts"
                            domain="[('user_id','=',uid)]"/>
                    <separator/>
-                   <filter string="Persons" name="type_person" domain="[('is_company','=',0)]"/>
+                   <filter string="Individuals" name="type_person" domain="[('is_company','=',0)]"/>
                    <filter string="Companies" name="type_company" domain="[('is_company','=',1)]"/>
                    <separator/>
                    <filter string="Customers" name="customer" domain="[('customer','=',1), ('parent_id', '=', False)]"/>
diff --git a/odoo/addons/base/wizard/base_partner_merge_views.xml b/odoo/addons/base/wizard/base_partner_merge_views.xml
index 259df710ee3..153f5eee01c 100644
--- a/odoo/addons/base/wizard/base_partner_merge_views.xml
+++ b/odoo/addons/base/wizard/base_partner_merge_views.xml
@@ -107,5 +107,5 @@
             multi="True"
             key2="client_action_multi"
             view_mode="form"
-            name="Merge Selected Contacts"/>
+            name="Merge Contacts"/>
 </odoo>