diff --git a/account_chart_update/views/account_config_settings_view.xml b/account_chart_update/views/account_config_settings_view.xml
index 99260a1e..d3646e17 100644
--- a/account_chart_update/views/account_config_settings_view.xml
+++ b/account_chart_update/views/account_config_settings_view.xml
@@ -1,31 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2016 Jairo Llopis <jairo.llopis@tecnativa.com>
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="name">Open Account Chart Update Wizard 2</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <div data-key="account" position="inside">
                 <h2>Update Chart Template</h2>
                 <div class="row mt16 o_settings_container">
                     <div class="col-xs-12 col-md-6 o_setting_box">
-                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_left_pane" />
                         <div class="o_setting_right_pane">
                             <span class="o_form_label">Update Chart Template</span>
                             <div class="text-muted">
                                 Update Taxes, fiscal positions or chart of accounts.
                             </div>
                             <div class="content-group">
-                                <div class="row mt16"/>
+                                <div class="row mt16" />
                                 <div>
-                                    <button string="Update chart template"
-                                            name="%(action_wizard_update_chart)d"
-                                            context="{'default_company_id': company_id}"
-                                            type="action"
-                                            icon="fa-arrow-right"
-                                            class="oe_link"
+                                    <button
+                                        string="Update chart template"
+                                        name="%(action_wizard_update_chart)d"
+                                        context="{'default_company_id': company_id}"
+                                        type="action"
+                                        icon="fa-arrow-right"
+                                        class="oe_link"
                                     />
                                 </div>
                             </div>
diff --git a/account_chart_update/wizard/wizard_chart_update_view.xml b/account_chart_update/wizard/wizard_chart_update_view.xml
index 8cb996a5..3d94d4cb 100644
--- a/account_chart_update/wizard/wizard_chart_update_view.xml
+++ b/account_chart_update/wizard/wizard_chart_update_view.xml
@@ -1,246 +1,299 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2016 Jairo Llopis <jairo.llopis@tecnativa.com>
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
-<record id="view_update_multi_chart" model="ir.ui.view">
-    <field name="name">Update Chart of Accounts from a Chart Template</field>
-    <field name="model">wizard.update.charts.accounts</field>
-    <field name="arch" type="xml">
-        <form>
-            <header>
-                <field
-                    name="state"
-                    select="2"
-                    widget="statusbar"
-                    statusbar_visible="init,ready,done"
-                    statusbar_colors='{"ready":"blue","done":"blue"}' />
-            </header>
-            <group attrs="{'invisible':[('state','!=','init')]}">
-                <h3>
-                    <p>
-                        <center>
+    <record id="view_update_multi_chart" model="ir.ui.view">
+        <field name="name">Update Chart of Accounts from a Chart Template</field>
+        <field name="model">wizard.update.charts.accounts</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <field
+                        name="state"
+                        select="2"
+                        widget="statusbar"
+                        statusbar_visible="init,ready,done"
+                        statusbar_colors='{"ready":"blue","done":"blue"}'
+                    />
+                </header>
+                <group attrs="{'invisible':[('state','!=','init')]}">
+                    <h3>
+                        <p>
+                            <center>
                             This wizard will update your accounts, taxes and
                             fiscal positions according to the selected chart
                             template
                         </center>
-                    </p>
-                </h3>
-            </group>
-            <group string="Chart of Accounts" attrs="{'invisible':[('state','!=','init')]}">
-                <field name="company_id"
-                       attrs="{'invisible':[('state','!=','init')]}"
-                        />
-                <field name="code_digits" invisible="1" />
-                <field name="chart_template_id"
-                       domain="[('visible', '=', True)]"
-                       attrs="{'invisible': [('state','!=','init')], 'required': True}"
-                        />
-                <field name="lang" attrs="{'invisible':[('state','!=','init')]}" />
-            </group>
-            <notebook attrs="{'invisible':[('state','!=','init')]}">
-                <page string="General options" name="page_general_options">
-                    <group>
-                        <group string="Update records?">
-                            <field name="update_tax" />
-                            <field name="update_account" />
-                            <field name="update_fiscal_position" />
+                        </p>
+                    </h3>
+                </group>
+                <group
+                    string="Chart of Accounts"
+                    attrs="{'invisible':[('state','!=','init')]}"
+                >
+                    <field
+                        name="company_id"
+                        attrs="{'invisible':[('state','!=','init')]}"
+                    />
+                    <field name="code_digits" invisible="1" />
+                    <field
+                        name="chart_template_id"
+                        domain="[('visible', '=', True)]"
+                        attrs="{'invisible': [('state','!=','init')], 'required': True}"
+                    />
+                    <field name="lang" attrs="{'invisible':[('state','!=','init')]}" />
+                </group>
+                <notebook attrs="{'invisible':[('state','!=','init')]}">
+                    <page string="General options" name="page_general_options">
+                        <group>
+                            <group string="Update records?">
+                                <field name="update_tax" />
+                                <field name="update_account" />
+                                <field name="update_fiscal_position" />
+                            </group>
+                            <group
+                                string="Other options"
+                                attrs="{'invisible':[('state','!=','init')]}"
+                            >
+                                <field name="continue_on_errors" />
+                                <field name="recreate_xml_ids" />
+                            </group>
                         </group>
-                        <group string="Other options" attrs="{'invisible':[('state','!=','init')]}">
-                            <field name="continue_on_errors" />
-                            <field name="recreate_xml_ids" />
-                        </group>
-                    </group>
-                    <group>
-                        <h5>
-                            <p>
+                        <group>
+                            <h5>
+                                <p>
                                 If you leave these options set, the wizard will
                                 not just create new records, but also update
                                 records with changes (i.e. different tax amount)
                             </p>
-                            <p>
+                                <p>
                                 Note: Only the changed fields are updated.
                             </p>
-                        </h5>
-                    </group>
-                </page>
-                <page string="Field options"
-                      attrs="{'invisible': [
+                            </h5>
+                        </group>
+                    </page>
+                    <page
+                        string="Field options"
+                        attrs="{'invisible': [
                           ('update_tax', '=', False),
                           ('update_account', '=', False),
                           ('update_fiscal_position', '=', False),
                       ]}"
-                >
-                    <h3>
-                        <p>
+                    >
+                        <h3>
+                            <p>
                             Here you can select the fields you want to check if
                             they have been updated in the templates.
                         </p>
-                    </h3>
-                    <notebook>
-                        <page string="Taxes"
-                              name="page_fields_taxes"
-                              attrs="{'invisible': [('update_tax', '=', False)]}"
-                        >
-                            <field name="tax_field_ids"
-                                   widget="many2many_checkboxes"
-                                   context="{'account_chart_update': True}"
-                            />
-                        </page>
-                        <page string="Accounts"
-                              name="page_fields_accounts"
-                              attrs="{'invisible': [('update_account', '=', False)]}"
-                        >
-                            <field name="account_field_ids"
-                                   widget="many2many_checkboxes"
-                                   context="{'account_chart_update': True}"
-                            />
-                        </page>
-                        <page string="Fiscal positions"
-                              name="page_fields_fps"
-                              attrs="{'invisible': [('update_fiscal_position', '=', False)]}"
-                        >
-                            <field name="fp_field_ids"
-                                   widget="many2many_checkboxes"
-                                   context="{'account_chart_update': True}"
-                            />
-                        </page>
-                    </notebook>
-                </page>
-                <page string="Matching"
-                      attrs="{'invisible': [
+                        </h3>
+                        <notebook>
+                            <page
+                                string="Taxes"
+                                name="page_fields_taxes"
+                                attrs="{'invisible': [('update_tax', '=', False)]}"
+                            >
+                                <field
+                                    name="tax_field_ids"
+                                    widget="many2many_checkboxes"
+                                    context="{'account_chart_update': True}"
+                                />
+                            </page>
+                            <page
+                                string="Accounts"
+                                name="page_fields_accounts"
+                                attrs="{'invisible': [('update_account', '=', False)]}"
+                            >
+                                <field
+                                    name="account_field_ids"
+                                    widget="many2many_checkboxes"
+                                    context="{'account_chart_update': True}"
+                                />
+                            </page>
+                            <page
+                                string="Fiscal positions"
+                                name="page_fields_fps"
+                                attrs="{'invisible': [('update_fiscal_position', '=', False)]}"
+                            >
+                                <field
+                                    name="fp_field_ids"
+                                    widget="many2many_checkboxes"
+                                    context="{'account_chart_update': True}"
+                                />
+                            </page>
+                        </notebook>
+                    </page>
+                    <page
+                        string="Matching"
+                        attrs="{'invisible': [
                           ('update_tax', '=', False),
                           ('update_account', '=', False),
                           ('update_fiscal_position', '=', False),
                       ]}"
+                    >
+                        <h3>
+                            <p>Here you can set the matching order.</p>
+                        </h3>
+                        <notebook>
+                            <page
+                                string="Taxes"
+                                name="page_matching_taxes"
+                                attrs="{'invisible': [('update_tax', '=', False)]}"
+                            >
+                                <field name="tax_matching_ids">
+                                    <tree
+                                        create="false"
+                                        edit="false"
+                                        default_order="sequence"
+                                    >
+                                        <field name="sequence" widget="handle" />
+                                        <field name="matching_value" />
+                                    </tree>
+                                    <form>
+                                        <field name="matching_value" readonly="1" />
+                                    </form>
+                                </field>
+                            </page>
+                            <page
+                                string="Accounts"
+                                name="page_matching_accounts"
+                                attrs="{'invisible': [('update_account', '=', False)]}"
+                            >
+                                <field name="account_matching_ids">
+                                    <tree
+                                        create="false"
+                                        edit="false"
+                                        default_order="sequence"
+                                    >
+                                        <field name="sequence" widget="handle" />
+                                        <field name="matching_value" />
+                                    </tree>
+                                    <form>
+                                        <field name="matching_value" readonly="1" />
+                                    </form>
+                                </field>
+                            </page>
+                            <page
+                                string="Fiscal positions"
+                                name="page_matching_fps"
+                                attrs="{'invisible': [('update_fiscal_position', '=', False)]}"
+                            >
+                                <field name="fp_matching_ids">
+                                    <tree
+                                        create="false"
+                                        edit="false"
+                                        default_order="sequence"
+                                    >
+                                        <field name="sequence" widget="handle" />
+                                        <field name="matching_value" />
+                                    </tree>
+                                    <form>
+                                        <field name="matching_value" readonly="1" />
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
+                    </page>
+                </notebook>
+                <group
+                    attrs="{'invisible':[('state','!=','ready'),]}"
+                    string="Records to create/update"
                 >
-                    <h3>
-                        <p>Here you can set the matching order.</p>
-                    </h3>
-                    <notebook>
-                        <page string="Taxes"
-                              name="page_matching_taxes"
-                              attrs="{'invisible': [('update_tax', '=', False)]}"
+                    <notebook colspan="4">
+                        <page
+                            string="Taxes"
+                            attrs="{'invisible': [('update_tax', '=', False)]}"
                         >
-                            <field name="tax_matching_ids">
-                                <tree create="false" edit="false" default_order="sequence">
-                                    <field name="sequence" widget="handle"/>
-                                    <field name="matching_value"/>
+                            <field name="tax_ids" nolabel="1">
+                                <tree string="Taxes" colors="red:type=='updated'">
+                                    <field name="tax_id" />
+                                    <field name="update_tax_id" />
+                                    <field name="type_tax_use" />
+                                    <field name="notes" />
+                                    <field name="type" />
                                 </tree>
-                                <form>
-                                    <field name="matching_value" readonly="1"/>
-                                </form>
                             </field>
                         </page>
-                        <page string="Accounts"
-                              name="page_matching_accounts"
-                              attrs="{'invisible': [('update_account', '=', False)]}"
+                        <page
+                            string="Accounts"
+                            attrs="{'invisible': [('update_account', '=', False)]}"
                         >
-                            <field name="account_matching_ids">
-                                <tree create="false" edit="false" default_order="sequence">
-                                    <field name="sequence" widget="handle"/>
-                                    <field name="matching_value"/>
+                            <field name="account_ids" nolabel="1">
+                                <tree string="Accounts" colors="red:type=='updated'">
+                                    <field name="account_id" />
+                                    <field name="update_account_id" />
+                                    <field name="notes" />
+                                    <field name="type" />
                                 </tree>
-                                <form>
-                                    <field name="matching_value" readonly="1"/>
-                                </form>
                             </field>
                         </page>
-                        <page string="Fiscal positions"
-                              name="page_matching_fps"
-                              attrs="{'invisible': [('update_fiscal_position', '=', False)]}"
+                        <page
+                            string="Fiscal positions"
+                            attrs="{'invisible': [('update_fiscal_position', '=', False)]}"
                         >
-                            <field name="fp_matching_ids">
-                                <tree create="false" edit="false" default_order="sequence">
-                                    <field name="sequence" widget="handle"/>
-                                    <field name="matching_value"/>
+                            <field name="fiscal_position_ids" nolabel="1">
+                                <tree
+                                    string="Fiscal positions"
+                                    colors="red:type=='updated'"
+                                >
+                                    <field name="fiscal_position_id" />
+                                    <field name="update_fiscal_position_id" />
+                                    <field name="notes" />
+                                    <field name="type" />
                                 </tree>
-                                <form>
-                                    <field name="matching_value" readonly="1"/>
-                                </form>
                             </field>
                         </page>
                     </notebook>
-                </page>
-            </notebook>
-            <group attrs="{'invisible':[('state','!=','ready'),]}"
-                string="Records to create/update">
-                <notebook colspan="4">
-                    <page string="Taxes" attrs="{'invisible': [('update_tax', '=', False)]}">
-                        <field name="tax_ids" nolabel="1">
-                            <tree string="Taxes" colors="red:type=='updated'">
-                                <field name="tax_id" />
-                                <field name="update_tax_id" />
-                                <field name="type_tax_use"/>
-                                <field name="notes"/>
-                                <field name="type"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Accounts" attrs="{'invisible': [('update_account', '=', False)]}">
-                        <field name="account_ids" nolabel="1">
-                            <tree string="Accounts" colors="red:type=='updated'">
-                                <field name="account_id" />
-                                <field name="update_account_id" />
-                                <field name="notes"/>
-                                <field name="type"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Fiscal positions" attrs="{'invisible': [('update_fiscal_position', '=', False)]}">
-                        <field name="fiscal_position_ids" nolabel="1">
-                            <tree string="Fiscal positions" colors="red:type=='updated'">
-                                <field name="fiscal_position_id" />
-                                <field name="update_fiscal_position_id" />
-                                <field name="notes"/>
-                                <field name="type"/>
-                            </tree>
-                        </field>
-                    </page>
-
-                </notebook>
-            </group>
-
-            <group col="4" colspan="4"
-                attrs="{'invisible':[('state','!=','done'),]}">
-                <separator colspan="4" string="Log" />
-                <field name="log" colspan="4" nolabel="1" />
-                <group colspan="4">
-                    <separator colspan="4" string="Summary of created objects" />
-                    <field name="new_taxes" />
-                    <field name="new_accounts" />
-                    <field name="new_fps" />
                 </group>
-                <group colspan="4">
-                    <separator colspan="4" string="Summary of updated objects" />
-                    <field name="updated_taxes" />
-                    <field name="deleted_taxes" />
-                    <field name="updated_accounts" />
-                    <field name="updated_fps" />
+                <group
+                    col="4"
+                    colspan="4"
+                    attrs="{'invisible':[('state','!=','done'),]}"
+                >
+                    <separator colspan="4" string="Log" />
+                    <field name="log" colspan="4" nolabel="1" />
+                    <group colspan="4">
+                        <separator colspan="4" string="Summary of created objects" />
+                        <field name="new_taxes" />
+                        <field name="new_accounts" />
+                        <field name="new_fps" />
+                    </group>
+                    <group colspan="4">
+                        <separator colspan="4" string="Summary of updated objects" />
+                        <field name="updated_taxes" />
+                        <field name="deleted_taxes" />
+                        <field name="updated_accounts" />
+                        <field name="updated_fps" />
+                    </group>
                 </group>
-            </group>
-
-            <footer>
-                <span states="init">
-                    <button name="action_find_records" string="Next" class="oe_highlight" type="object" />
-                </span>
-                <span states="ready">
-                    <button name="action_init" string="Previous" type="object" />
-                    <button name="action_update_records" string="Create/Update" type="object" class="oe_highlight" />
-                </span>
-                <span states="init,ready"> or </span>
-                <button special="cancel" string="Close" class="oe_link" />
-            </footer>
-        </form>
-    </field>
-</record>
-
-<record id="action_wizard_update_chart" model="ir.actions.act_window">
-    <field name="name">Update chart of accounts</field>
-    <field name="type">ir.actions.act_window</field>
-    <field name="res_model">wizard.update.charts.accounts</field>
-    <field name="view_mode">form</field>
-    <field name="target">new</field>
-</record>
-
+                <footer>
+                    <span states="init">
+                        <button
+                            name="action_find_records"
+                            string="Next"
+                            class="oe_highlight"
+                            type="object"
+                        />
+                    </span>
+                    <span states="ready">
+                        <button name="action_init" string="Previous" type="object" />
+                        <button
+                            name="action_update_records"
+                            string="Create/Update"
+                            type="object"
+                            class="oe_highlight"
+                        />
+                    </span>
+                    <span states="init,ready"> or </span>
+                    <button special="cancel" string="Close" class="oe_link" />
+                </footer>
+            </form>
+        </field>
+    </record>
+    <record id="action_wizard_update_chart" model="ir.actions.act_window">
+        <field name="name">Update chart of accounts</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">wizard.update.charts.accounts</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
 </odoo>