diff --git a/account_payment_mode/demo/payment_demo.xml b/account_payment_mode/demo/payment_demo.xml
index 29b4c2685..927f6ec9a 100644
--- a/account_payment_mode/demo/payment_demo.xml
+++ b/account_payment_mode/demo/payment_demo.xml
@@ -1,108 +1,110 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
-<record id="bank_fiducial" model="res.bank">
-    <field name="name">Fiducial Banque</field>
-    <field name="bic">FIDCFR21XXX</field>
-    <field name="street">38 rue Sergent Michel Berthet</field>
-    <field name="zip">69009</field>
-    <field name="city">Lyon</field>
-    <field name="country" ref="base.fr"/>
-</record>
-
-<record id="bank_la_banque_postale" model="res.bank">
-    <field name="name">La Banque Postale</field>
-    <field name="bic">PSSTFRPPXXX</field>
-    <field name="street">115 rue de Sèvres</field>
-    <field name="zip">75007</field>
-    <field name="city">Paris</field>
-    <field name="country" ref="base.fr"/>
-</record>
-
-<record id="bank_societe_generale" model="res.bank">
-    <field name="name">Société Générale</field>
-    <field name="bic">SOGEFRPPXXX</field>
-    <field name="street">1 avenue du Roi Fabien 1er</field>
-    <field name="zip">75008</field>
-    <field name="city">Paris</field>
-    <field name="country" ref="base.fr"/>
-</record>
-
-<record id="bank_fortis" model="res.bank">
-    <field name="name">BNP Paribas Fortis Charleroi</field>
-    <field name="bic">GEBABEBB03A</field>
-    <field name="city">Charleroi</field>
-    <field name="country" ref="base.be"/>
-</record>
-
-
-<record id="main_company_iban" model="res.partner.bank">
-    <field name="acc_number">FR76 4242 4242 4242 4242 4242 424</field>
-    <field name="bank_id" ref="bank_la_banque_postale"/>
-    <field name="partner_id" ref="base.main_partner" />
-</record>
-
-<record id="main_company_iban2" model="res.partner.bank">
-    <field name="acc_number">FR20 1242 1242 1242 1242 1242 124</field>
-    <field name="bank_id" ref="bank_societe_generale"/>
-    <field name="partner_id" ref="base.main_partner" />
-</record>
-
-<record id="res_partner_12_iban" model="res.partner.bank">
-    <field name="acc_number">FR66 1212 1212 1212 1212 1212 121</field>
-    <field name="bank_id" ref="bank_fiducial"/>
-    <field name="partner_id" ref="base.res_partner_12" />
-</record>
-
-<record id="res_partner_2_iban" model="res.partner.bank">
-    <field name="acc_number">BE96 9988 7766 5544</field>
-    <field name="bank_id" ref="bank_fortis"/>
-    <field name="partner_id" ref="base.res_partner_2" />
-</record>
-
-<!-- Asustek already has a demo IBAN provided by base_iban -->
-
-<record id="payment_mode_outbound_ct1" model="account.payment.mode">
-    <field name="name">Credit Transfer to Suppliers</field>
-    <field name="company_id" ref="base.main_company"/>
-    <field name="bank_account_link">variable</field>
-    <field name="payment_method_id" ref="account.account_payment_method_manual_out"/>
-</record>
-
-<record id="payment_mode_outbound_dd1" model="account.payment.mode">
-    <field name="name">Direct Debit of suppliers from Société Générale</field>
-    <field name="company_id" ref="base.main_company"/>
-    <field name="bank_account_link">variable</field>
-    <field name="payment_method_id" ref="account.account_payment_method_manual_out"/>
-</record>
-
-<record id="payment_mode_outbound_dd2" model="account.payment.mode">
-    <field name="name">Direct Debit of suppliers from La Banque Postale</field>
-    <field name="company_id" ref="base.main_company"/>
-    <field name="bank_account_link">variable</field>
-    <field name="payment_method_id" ref="account.account_payment_method_manual_out"/>
-</record>
-
-<record id="payment_mode_inbound_ct1" model="account.payment.mode">
-    <field name="name">Inbound Credit Trf Société Générale</field>
-    <field name="company_id" ref="base.main_company"/>
-    <field name="bank_account_link">variable</field> <!-- TODO: convert to fixed -->
-    <field name="payment_method_id" ref="account.account_payment_method_manual_in"/>
-</record>
-
-<record id="payment_mode_inbound_ct2" model="account.payment.mode">
-    <field name="name">Inbound Credit Trf La Banque Postale</field>
-    <field name="company_id" ref="base.main_company"/>
-    <field name="bank_account_link">variable</field> <!-- TODO: convert to fixed -->
-    <field name="payment_method_id" ref="account.account_payment_method_manual_in"/>
-</record>
-
-<record id="payment_mode_inbound_dd1" model="account.payment.mode">
-    <field name="name">Direct Debit of customers</field>
-    <field name="company_id" ref="base.main_company"/>
-    <field name="bank_account_link">variable</field>
-    <field name="payment_method_id" ref="account.account_payment_method_manual_in"/>
-</record>
-
-
+    <record id="bank_fiducial" model="res.bank">
+        <field name="name">Fiducial Banque</field>
+        <field name="bic">FIDCFR21XXX</field>
+        <field name="street">38 rue Sergent Michel Berthet</field>
+        <field name="zip">69009</field>
+        <field name="city">Lyon</field>
+        <field name="country" ref="base.fr" />
+    </record>
+    <record id="bank_la_banque_postale" model="res.bank">
+        <field name="name">La Banque Postale</field>
+        <field name="bic">PSSTFRPPXXX</field>
+        <field name="street">115 rue de Sèvres</field>
+        <field name="zip">75007</field>
+        <field name="city">Paris</field>
+        <field name="country" ref="base.fr" />
+    </record>
+    <record id="bank_societe_generale" model="res.bank">
+        <field name="name">Société Générale</field>
+        <field name="bic">SOGEFRPPXXX</field>
+        <field name="street">1 avenue du Roi Fabien 1er</field>
+        <field name="zip">75008</field>
+        <field name="city">Paris</field>
+        <field name="country" ref="base.fr" />
+    </record>
+    <record id="bank_fortis" model="res.bank">
+        <field name="name">BNP Paribas Fortis Charleroi</field>
+        <field name="bic">GEBABEBB03A</field>
+        <field name="city">Charleroi</field>
+        <field name="country" ref="base.be" />
+    </record>
+    <record id="main_company_iban" model="res.partner.bank">
+        <field name="acc_number">FR76 4242 4242 4242 4242 4242 424</field>
+        <field name="bank_id" ref="bank_la_banque_postale" />
+        <field name="partner_id" ref="base.main_partner" />
+    </record>
+    <record id="main_company_iban2" model="res.partner.bank">
+        <field name="acc_number">FR20 1242 1242 1242 1242 1242 124</field>
+        <field name="bank_id" ref="bank_societe_generale" />
+        <field name="partner_id" ref="base.main_partner" />
+    </record>
+    <record id="res_partner_12_iban" model="res.partner.bank">
+        <field name="acc_number">FR66 1212 1212 1212 1212 1212 121</field>
+        <field name="bank_id" ref="bank_fiducial" />
+        <field name="partner_id" ref="base.res_partner_12" />
+    </record>
+    <record id="res_partner_2_iban" model="res.partner.bank">
+        <field name="acc_number">BE96 9988 7766 5544</field>
+        <field name="bank_id" ref="bank_fortis" />
+        <field name="partner_id" ref="base.res_partner_2" />
+    </record>
+    <!-- Asustek already has a demo IBAN provided by base_iban -->
+    <record id="payment_mode_outbound_ct1" model="account.payment.mode">
+        <field name="name">Credit Transfer to Suppliers</field>
+        <field name="company_id" ref="base.main_company" />
+        <field name="bank_account_link">variable</field>
+        <field
+            name="payment_method_id"
+            ref="account.account_payment_method_manual_out"
+        />
+    </record>
+    <record id="payment_mode_outbound_dd1" model="account.payment.mode">
+        <field name="name">Direct Debit of suppliers from Société Générale</field>
+        <field name="company_id" ref="base.main_company" />
+        <field name="bank_account_link">variable</field>
+        <field
+            name="payment_method_id"
+            ref="account.account_payment_method_manual_out"
+        />
+    </record>
+    <record id="payment_mode_outbound_dd2" model="account.payment.mode">
+        <field name="name">Direct Debit of suppliers from La Banque Postale</field>
+        <field name="company_id" ref="base.main_company" />
+        <field name="bank_account_link">variable</field>
+        <field
+            name="payment_method_id"
+            ref="account.account_payment_method_manual_out"
+        />
+    </record>
+    <record id="payment_mode_inbound_ct1" model="account.payment.mode">
+        <field name="name">Inbound Credit Trf Société Générale</field>
+        <field name="company_id" ref="base.main_company" />
+        <field name="bank_account_link">variable</field>
+        <!-- TODO: convert to fixed -->
+        <field
+            name="payment_method_id"
+            ref="account.account_payment_method_manual_in"
+        />
+    </record>
+    <record id="payment_mode_inbound_ct2" model="account.payment.mode">
+        <field name="name">Inbound Credit Trf La Banque Postale</field>
+        <field name="company_id" ref="base.main_company" />
+        <field name="bank_account_link">variable</field>
+        <!-- TODO: convert to fixed -->
+        <field
+            name="payment_method_id"
+            ref="account.account_payment_method_manual_in"
+        />
+    </record>
+    <record id="payment_mode_inbound_dd1" model="account.payment.mode">
+        <field name="name">Direct Debit of customers</field>
+        <field name="company_id" ref="base.main_company" />
+        <field name="bank_account_link">variable</field>
+        <field
+            name="payment_method_id"
+            ref="account.account_payment_method_manual_in"
+        />
+    </record>
 </odoo>
diff --git a/account_payment_mode/security/account_payment_mode.xml b/account_payment_mode/security/account_payment_mode.xml
index 609bc0f79..506ba65d2 100644
--- a/account_payment_mode/security/account_payment_mode.xml
+++ b/account_payment_mode/security/account_payment_mode.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
-<record id="account_payment_mode_company_rule" model="ir.rule">
-  <field name="name">Payment mode multi-company rule</field>
-  <field name="model_id" ref="model_account_payment_mode"/>
-  <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
-</record>
-
+    <record id="account_payment_mode_company_rule" model="ir.rule">
+        <field name="name">Payment mode multi-company rule</field>
+        <field name="model_id" ref="model_account_payment_mode" />
+        <field
+            name="domain_force"
+        >['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+    </record>
 </odoo>
diff --git a/account_payment_mode/views/account_journal.xml b/account_payment_mode/views/account_journal.xml
index f5b86bb7d..c91004754 100644
--- a/account_payment_mode/views/account_journal.xml
+++ b/account_payment_mode/views/account_journal.xml
@@ -1,27 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-<!-- FIX of the 'account' module: on the form view of a bank journal,
+    <!-- FIX of the 'account' module: on the form view of a bank journal,
 allow to link to an existing bank account -->
-<record id="view_account_journal_form" model="ir.ui.view">
-    <field name="name">fix_bank_account_selection.account_journal.form</field>
-    <field name="model">account.journal</field>
-    <field name="inherit_id" ref="account.view_account_journal_form"/>
-    <field name="arch" type="xml">
-        <field name="bank_account_id" position="before">
-            <field name="company_partner_id" invisible="1"/>
-        </field>
-
-        <field name="bank_account_id" position="attributes">
-            <attribute name="domain">[('partner_id', '=', company_partner_id)]</attribute>
-        </field>
-        <!-- better when related fields are readonly, otherwise the user
+    <record id="view_account_journal_form" model="ir.ui.view">
+        <field name="name">fix_bank_account_selection.account_journal.form</field>
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.view_account_journal_form" />
+        <field name="arch" type="xml">
+            <field name="bank_account_id" position="before">
+                <field name="company_partner_id" invisible="1" />
+            </field>
+            <field name="bank_account_id" position="attributes">
+                <attribute
+                    name="domain"
+                >[('partner_id', '=', company_partner_id)]</attribute>
+            </field>
+            <!-- better when related fields are readonly, otherwise the user
         doesn't understand that he is changing the bank_id on the underlying
         res.partner.bank object -->
-        <field name="bank_id" position="attributes">
-            <attribute name="readonly">1</attribute>
+            <field name="bank_id" position="attributes">
+                <attribute name="readonly">1</attribute>
+            </field>
         </field>
-    </field>
-</record>
-
+    </record>
 </odoo>
diff --git a/account_payment_mode/views/account_payment_method.xml b/account_payment_mode/views/account_payment_method.xml
index cb60f2c5f..47e70d4c6 100644
--- a/account_payment_mode/views/account_payment_method.xml
+++ b/account_payment_mode/views/account_payment_method.xml
@@ -1,61 +1,73 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-<!-- The object account.payment.method is defined in the account module
+    <!-- The object account.payment.method is defined in the account module
 but there are no view for this object in the account module... so we define it
 here. I hate the objects that don't have a view... -->
-<record id="account_payment_method_form" model="ir.ui.view">
-    <field name="name">account_payment_method.form</field>
-    <field name="model">account.payment.method</field>
-    <field name="arch" type="xml">
-        <form string="Payment Method">
-            <group name="main">
-                <field name="name"/>
-                <field name="code"/>
-                <field name="payment_type"/>
-                <field name="bank_account_required"/>
-                <field name="active"/>
-            </group>
-        </form>
-    </field>
-</record>
-
-<record id="account_payment_method_tree" model="ir.ui.view">
-    <field name="name">account_payment_method.tree</field>
-    <field name="model">account.payment.method</field>
-    <field name="arch" type="xml">
-        <tree>
-            <field name="name"/>
-            <field name="code"/>
-            <field name="payment_type"/>
-        </tree>
-    </field>
-</record>
-
-<record id="account_payment_method_search" model="ir.ui.view">
-    <field name="name">account_payment_method.search</field>
-    <field name="model">account.payment.method</field>
-    <field name="arch" type="xml">
-        <search string="Search Payment Methods">
-            <field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]" string="Name or Code"/>
-            <filter name="inbound" string="Inbound" domain="[('payment_type', '=', 'inbound')]" />
-            <filter name="outbound" string="Outbound" domain="[('payment_type', '=', 'outbound')]" />
-            <group string="Group By" name="groupby">
-                <filter string="Payment Type" name="payment_type_groupby" context="{'group_by': 'payment_type'}"/>
-            </group>
-        </search>
-    </field>
-</record>
-
-<record id="account_payment_method_action" model="ir.actions.act_window">
-    <field name="name">Payment Methods</field>
-    <field name="res_model">account.payment.method</field>
-    <field name="view_mode">tree,form</field>
-</record>
-
-<menuitem id="account_payment_method_menu"
-            action="account_payment_method_action"
-            parent="account.account_management_menu"
-            sequence="30" />
-
+    <record id="account_payment_method_form" model="ir.ui.view">
+        <field name="name">account_payment_method.form</field>
+        <field name="model">account.payment.method</field>
+        <field name="arch" type="xml">
+            <form string="Payment Method">
+                <group name="main">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="payment_type" />
+                    <field name="bank_account_required" />
+                    <field name="active" />
+                </group>
+            </form>
+        </field>
+    </record>
+    <record id="account_payment_method_tree" model="ir.ui.view">
+        <field name="name">account_payment_method.tree</field>
+        <field name="model">account.payment.method</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+                <field name="code" />
+                <field name="payment_type" />
+            </tree>
+        </field>
+    </record>
+    <record id="account_payment_method_search" model="ir.ui.view">
+        <field name="name">account_payment_method.search</field>
+        <field name="model">account.payment.method</field>
+        <field name="arch" type="xml">
+            <search string="Search Payment Methods">
+                <field
+                    name="name"
+                    filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"
+                    string="Name or Code"
+                />
+                <filter
+                    name="inbound"
+                    string="Inbound"
+                    domain="[('payment_type', '=', 'inbound')]"
+                />
+                <filter
+                    name="outbound"
+                    string="Outbound"
+                    domain="[('payment_type', '=', 'outbound')]"
+                />
+                <group string="Group By" name="groupby">
+                    <filter
+                        string="Payment Type"
+                        name="payment_type_groupby"
+                        context="{'group_by': 'payment_type'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+    <record id="account_payment_method_action" model="ir.actions.act_window">
+        <field name="name">Payment Methods</field>
+        <field name="res_model">account.payment.method</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
+        id="account_payment_method_menu"
+        action="account_payment_method_action"
+        parent="account.account_management_menu"
+        sequence="30"
+    />
 </odoo>
diff --git a/account_payment_mode/views/account_payment_mode.xml b/account_payment_mode/views/account_payment_mode.xml
index b5654685b..d83ca15c7 100644
--- a/account_payment_mode/views/account_payment_mode.xml
+++ b/account_payment_mode/views/account_payment_mode.xml
@@ -1,72 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-<record id="account_payment_mode_form" model="ir.ui.view">
-    <field name="name">account.payment.mode.form</field>
-    <field name="model">account.payment.mode</field>
-    <field name="arch" type="xml">
-        <form string="Payment Mode">
-            <group name="main">
-                <field name="name"/>
-                <field name="company_id" groups="base.group_multi_company"/>
-                <field name="active"/>
-                <field name="payment_method_id"/>
-                <field name="payment_type"/>
-                <field name="bank_account_link"/>
-                <field name="fixed_journal_id"
-                    attrs="{'invisible': [('bank_account_link', '!=', 'fixed')], 'required': [('bank_account_link', '=', 'fixed')]}"
-                    domain="[('company_id', '=', company_id), ('type', '=', 'bank')]"
+    <record id="account_payment_mode_form" model="ir.ui.view">
+        <field name="name">account.payment.mode.form</field>
+        <field name="model">account.payment.mode</field>
+        <field name="arch" type="xml">
+            <form string="Payment Mode">
+                <group name="main">
+                    <field name="name" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                    <field name="active" />
+                    <field name="payment_method_id" />
+                    <field name="payment_type" />
+                    <field name="bank_account_link" />
+                    <field
+                        name="fixed_journal_id"
+                        attrs="{'invisible': [('bank_account_link', '!=', 'fixed')], 'required': [('bank_account_link', '=', 'fixed')]}"
+                        domain="[('company_id', '=', company_id), ('type', '=', 'bank')]"
+                    />
+                    <field
+                        name="variable_journal_ids"
+                        attrs="{'invisible': [('bank_account_link', '!=', 'variable')], 'required': [('bank_account_link', '=', 'variable')]}"
+                        domain="[('company_id', '=', company_id), ('type', '=', 'bank')]"
+                        widget="many2many_tags"
+                    />
+                </group>
+                <group string="Note" name="note">
+                    <field name="note" nolabel="1" />
+                </group>
+            </form>
+        </field>
+    </record>
+    <record id="account_payment_mode_tree" model="ir.ui.view">
+        <field name="name">account.payment.mode.tree</field>
+        <field name="model">account.payment.mode</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+                <field name="payment_method_id" />
+                <field name="payment_type" />
+                <field name="bank_account_link" />
+                <field name="company_id" groups="base.group_multi_company" />
+            </tree>
+        </field>
+    </record>
+    <record id="account_payment_mode_search" model="ir.ui.view">
+        <field name="name">account.payment.mode.search</field>
+        <field name="model">account.payment.mode</field>
+        <field name="arch" type="xml">
+            <search string="Search Payment Modes">
+                <field name="name" />
+                <filter
+                    name="inbound"
+                    string="Inbound"
+                    domain="[('payment_type', '=', 'inbound')]"
                 />
-                <field name="variable_journal_ids"
-                    attrs="{'invisible': [('bank_account_link', '!=', 'variable')], 'required': [('bank_account_link', '=', 'variable')]}"
-                    domain="[('company_id', '=', company_id), ('type', '=', 'bank')]"
-                    widget="many2many_tags"/>
-            </group>
-            <group string="Note" name="note">
-                <field name="note" nolabel="1"/>
-            </group>
-        </form>
-    </field>
-</record>
-
-<record id="account_payment_mode_tree" model="ir.ui.view">
-    <field name="name">account.payment.mode.tree</field>
-    <field name="model">account.payment.mode</field>
-    <field name="arch" type="xml">
-        <tree>
-            <field name="name"/>
-            <field name="payment_method_id"/>
-            <field name="payment_type"/>
-            <field name="bank_account_link"/>
-            <field name="company_id" groups="base.group_multi_company"/>
-        </tree>
-    </field>
-</record>
-
-<record id="account_payment_mode_search" model="ir.ui.view">
-    <field name="name">account.payment.mode.search</field>
-    <field name="model">account.payment.mode</field>
-    <field name="arch" type="xml">
-        <search string="Search Payment Modes">
-            <field name="name"/>
-            <filter name="inbound" string="Inbound" domain="[('payment_type', '=', 'inbound')]" />
-            <filter name="outbound" string="Outbound" domain="[('payment_type', '=', 'outbound')]" />
-            <group string="Group By" name="groupby">
-                <filter string="Payment Method" name="payment_method_groupby" context="{'group_by': 'payment_method_id'}"/>
-            </group>
-        </search>
-    </field>
-</record>
-
-<record id="account_payment_mode_action" model="ir.actions.act_window">
-    <field name="name">Payment Modes</field>
-    <field name="res_model">account.payment.mode</field>
-    <field name="view_mode">tree,form</field>
-</record>
-
-<menuitem id="account_payment_mode_menu"
-            action="account_payment_mode_action"
-            parent="account.account_management_menu"
-            sequence="25" />
-
+                <filter
+                    name="outbound"
+                    string="Outbound"
+                    domain="[('payment_type', '=', 'outbound')]"
+                />
+                <group string="Group By" name="groupby">
+                    <filter
+                        string="Payment Method"
+                        name="payment_method_groupby"
+                        context="{'group_by': 'payment_method_id'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+    <record id="account_payment_mode_action" model="ir.actions.act_window">
+        <field name="name">Payment Modes</field>
+        <field name="res_model">account.payment.mode</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
+        id="account_payment_mode_menu"
+        action="account_payment_mode_action"
+        parent="account.account_management_menu"
+        sequence="25"
+    />
 </odoo>
diff --git a/account_payment_mode/views/res_partner.xml b/account_payment_mode/views/res_partner.xml
index 61a1618e4..6fdd88b76 100644
--- a/account_payment_mode/views/res_partner.xml
+++ b/account_payment_mode/views/res_partner.xml
@@ -1,21 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-
-<!-- Avoid creation of bank accounts linked to contacts.
+    <!-- Avoid creation of bank accounts linked to contacts.
 Note that, when you use the res.partner.bank menu entry,
 there is a domain on the 'partner_id' field of res.partner.bank (base module)
 which prevents the selection of a contact -->
-<record id="partner_view_buttons" model="ir.ui.view">
-    <field name="name">account_payment_mode.res_partner_form</field>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="account.partner_view_buttons"/>
-    <field name="arch" type="xml">
-        <group name="banks" position="attributes">
-            <attribute name="attrs">{'invisible': [('parent_id', '!=', False), ('is_company', '=', False)]}</attribute>
-        </group>
-    </field>
-</record>
-
-
+    <record id="partner_view_buttons" model="ir.ui.view">
+        <field name="name">account_payment_mode.res_partner_form</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="account.partner_view_buttons" />
+        <field name="arch" type="xml">
+            <group name="banks" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'invisible': [('parent_id', '!=', False), ('is_company', '=', False)]}</attribute>
+            </group>
+        </field>
+    </record>
 </odoo>
diff --git a/account_payment_mode/views/res_partner_bank.xml b/account_payment_mode/views/res_partner_bank.xml
index 2f281dd01..a3ce48b6d 100644
--- a/account_payment_mode/views/res_partner_bank.xml
+++ b/account_payment_mode/views/res_partner_bank.xml
@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-<!-- Show acc_type on res.partner.bank in order to be able to
+    <!-- Show acc_type on res.partner.bank in order to be able to
 detect wrong IBANs -->
-<record id="view_partner_bank_tree" model="ir.ui.view">
-    <field name="name">account_payment_mode.res_partner_bank_tree</field>
-    <field name="model">res.partner.bank</field>
-    <field name="inherit_id" ref="base.view_partner_bank_tree"/>
-    <field name="arch" type="xml">
-        <field name="partner_id" position="after">
-            <field name="acc_type" string="Bank Account Type"/>
+    <record id="view_partner_bank_tree" model="ir.ui.view">
+        <field name="name">account_payment_mode.res_partner_bank_tree</field>
+        <field name="model">res.partner.bank</field>
+        <field name="inherit_id" ref="base.view_partner_bank_tree" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="acc_type" string="Bank Account Type" />
+            </field>
         </field>
-    </field>
-</record>
-
-
+    </record>
 </odoo>