diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index cfe85a454a9..955ecdd76a3 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -187,7 +187,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'" string="Invoice">
                     <field name="partner_id" groups="base.group_user" string="Supplier"/>
-                    <field name="date_invoice"/>
+                    <field name="date_invoice" string="Bill Date"/>
                     <field name="number"/>
                     <field name="reference"/>
                     <field name="commercial_partner_id" invisible="1"/>
@@ -196,11 +196,9 @@
                     <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                     <field name="date_due"/>
                     <field name="origin"/>
-                    <field name="amount_untaxed" groups="base.group_multi_currency"/>
-                    <field name="amount_untaxed_signed" sum="Untaxed Amount"/>
                     <field name="amount_total_signed" sum="Total Amount"/>
                     <field name="residual_signed" sum="Residual Amount" string="To Pay"/>
-                    <field name="currency_id" groups="base.group_multi_currency"/>
+                    <field name="currency_id" invisible="1"/>
                     <field name="company_currency_id" invisible="1"/>
                     <field name="state"/>
                     <field name="type" invisible="context.get('type',True)"/>
@@ -246,7 +244,7 @@
                         </group>
                         <group>
                             <field name="origin" attrs="{'invisible': [('origin', '=', False)]}"/>
-                            <field name="date_invoice" />
+                            <field name="date_invoice" string="Bill Date"/>
                             <field name="date_due"/>
                             <field name="move_name" invisible="1"/>
                             <field name="currency_id" groups="base.group_multi_currency"/>
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
index 20b1d81ae1e..38b97c5602b 100644
--- a/addons/account/views/account_payment_view.xml
+++ b/addons/account/views/account_payment_view.xml
@@ -12,10 +12,32 @@
                     <field name="journal_id"/>
                     <field name="payment_type"/>
                     <field name="payment_method"/>
-                    <field name="partner_id"/>
-                    <field name="amount" widget="monetary"/>
+                    <field name="partner_id" string="Customer"/>
+                    <field name="amount"/>
                     <field name="state"/>
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="currency_id" invisible="1"/>
+                    <field name="partner_type" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_account_supplier_payment_tree" model="ir.ui.view">
+            <field name="name">account.supplier.payment.tree</field>
+            <field name="model">account.payment</field>
+            <field name="arch" type="xml">
+                <tree colors="blue:state=='draft'; #707070:state=='sent'; #A0A0A0:state=='reconciled'" edit="false">
+                    <field name="payment_date"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="payment_type"/>
+                    <field name="payment_method"/>
+                    <field name="partner_id" string="Supplier"/>
+                    <field name="amount"/>
+                    <field name="state"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="currency_id" invisible="1"/>
+                    <field name="partner_type" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -117,6 +139,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="context">{'default_payment_type': 'inbound'}</field>
+            <field name="domain">[('partner_type', '=', 'customer')]</field>
+            <field name="view_id" ref="view_account_payment_tree"/>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                   Click to register a payment
@@ -133,6 +157,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="context">{}</field>
+            <field name="domain">[('partner_type', '=', 'supplier')]</field>
+            <field name="view_id" ref="view_account_supplier_payment_tree"/>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                   Click to register a payment
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 2413d12d252..7dc361c4970 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -983,7 +983,7 @@
                                     </group>
                                     <group string="Taxes">
                                         <field name="tax_line_id"/>
-                                        <field name="tax_ids"/>
+                                        <field name="tax_ids" widget="many2many_tags"/>
                                     </group>
                                     <group string="Currency" groups="base.group_multi_currency">
                                         <field name="currency_id" invisible="1"/>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index c4a09d44131..1670b55dce4 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -56,7 +56,6 @@
         <field name="inherit_id" ref="account.view_move_line_tree"/>
         <field name="arch" type="xml">
             <field name="analytic_account_id" position="replace">
-                <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
             </field>
         </field>
     </record>