diff --git a/intrastat_base/data/country_data.xml b/intrastat_base/data/country_data.xml
index 3c75a3a..cb950e6 100644
--- a/intrastat_base/data/country_data.xml
+++ b/intrastat_base/data/country_data.xml
@@ -1,89 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="base.fr" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.de" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.at" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.cy" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.dk" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.es" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.ee" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.fi" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.gr" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.hu" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.ie" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.it" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.lv" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.lt" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.lu" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.mt" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.nl" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.pl" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.pt" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.sk" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.cz" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.uk" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.si" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.se" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.ro" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.bg" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.be" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
     <record id="base.hr" model="res.country">
-        <field name="intrastat" eval="True"/>
+        <field name="intrastat" eval="True" />
     </record>
-
 </odoo>
diff --git a/intrastat_base/demo/intrastat_demo.xml b/intrastat_base/demo/intrastat_demo.xml
index f8adbb7..5a93379 100644
--- a/intrastat_base/demo/intrastat_demo.xml
+++ b/intrastat_base/demo/intrastat_demo.xml
@@ -1,27 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2011-2019 Akretion France (http://www.akretion.com/)
   @author: Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo noupdate="1">
-
-<record id="base.main_partner" model="res.partner">
-    <field name="vat">FR58441019213</field>
-</record>
-
-<record id="base.res_partner_2" model="res.partner"> <!-- Deco Addict -->
-    <field name="vat">BE0884025633</field>
-</record>
-
-<record id="shipping_costs_exclude" model="product.product">
-    <field name="name">Shipping costs</field>
-    <field name="default_code">SHIP_S</field>
-    <field name="type">service</field>
-    <field name="categ_id" ref="product.product_category_all"/>
-    <field name="list_price">30</field>
-    <field name="is_accessory_cost">True</field>
-</record>
-
+    <record id="base.main_partner" model="res.partner">
+        <field name="vat">FR58441019213</field>
+    </record>
+    <record id="base.res_partner_2" model="res.partner">
+        <!-- Deco Addict -->
+        <field name="vat">BE0884025633</field>
+    </record>
+    <record id="shipping_costs_exclude" model="product.product">
+        <field name="name">Shipping costs</field>
+        <field name="default_code">SHIP_S</field>
+        <field name="type">service</field>
+        <field name="categ_id" ref="product.product_category_all" />
+        <field name="list_price">30</field>
+        <field name="is_accessory_cost">True</field>
+    </record>
 </odoo>
diff --git a/intrastat_base/views/account_tax.xml b/intrastat_base/views/account_tax.xml
index 222f71b..0479a6f 100644
--- a/intrastat_base/views/account_tax.xml
+++ b/intrastat_base/views/account_tax.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
  Copyright 2011-2019 Akretion France (http://www.akretion.com/)
  @author: Alexis de Lattre <alexis.delattre@akretion.com>
  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
-<!-- Add 'exclude_from_intrastat_if_present' on tax form view -->
-<record id="view_tax_form" model="ir.ui.view">
-    <field name="name">intrastat.base.tax</field>
-    <field name="model">account.tax</field>
-    <field name="inherit_id" ref="account.view_tax_form"/>
-    <field name="arch" type="xml">
-        <field name="active" position="before">
-            <field name="exclude_from_intrastat_if_present"/>
+    <!-- Add 'exclude_from_intrastat_if_present' on tax form view -->
+    <record id="view_tax_form" model="ir.ui.view">
+        <field name="name">intrastat.base.tax</field>
+        <field name="model">account.tax</field>
+        <field name="inherit_id" ref="account.view_tax_form" />
+        <field name="arch" type="xml">
+            <field name="active" position="before">
+                <field name="exclude_from_intrastat_if_present" />
+            </field>
         </field>
-    </field>
-</record>
-
+    </record>
 </odoo>
diff --git a/intrastat_base/views/intrastat.xml b/intrastat_base/views/intrastat.xml
index 3381e0c..92bfba2 100644
--- a/intrastat_base/views/intrastat.xml
+++ b/intrastat_base/views/intrastat.xml
@@ -1,33 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2011-2016 Akretion France (http://www.akretion.com/)
   Copyright 2015-2016 Noviat (http://www.noviat.com/)
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
     <!-- Menu entries for Intrastat -->
-    <menuitem id="menu_intrastat_base_root"
-              name="Intrastat"
-              parent="account.menu_finance_reports" sequence="50"/>
-    <menuitem id="menu_intrastat_config_root" name="Intrastat"
-              parent="account.menu_finance_configuration" sequence="50"/>
-
-
+    <menuitem
+        id="menu_intrastat_base_root"
+        name="Intrastat"
+        parent="account.menu_finance_reports"
+        sequence="50"
+    />
+    <menuitem
+        id="menu_intrastat_config_root"
+        name="Intrastat"
+        parent="account.menu_finance_configuration"
+        sequence="50"
+    />
     <record id="intrastat_result_view_form" model="ir.ui.view">
-      <field name="name">intrastat.result_view_form</field>
-      <field name="model">intrastat.result.view</field>
-      <field name="arch" type="xml">
-        <form string="Intrastat Result View">
-          <group name="main">
-            <field name="note" nolabel="1"/>
-          </group>
-          <footer>
-            <button string="Ok" class="oe_highlight" special="cancel"/>
-          </footer>
-        </form>
-      </field>
+        <field name="name">intrastat.result_view_form</field>
+        <field name="model">intrastat.result.view</field>
+        <field name="arch" type="xml">
+            <form string="Intrastat Result View">
+                <group name="main">
+                    <field name="note" nolabel="1" />
+                </group>
+                <footer>
+                    <button string="Ok" class="oe_highlight" special="cancel" />
+                </footer>
+            </form>
+        </field>
     </record>
-
 </odoo>
diff --git a/intrastat_base/views/product_template.xml b/intrastat_base/views/product_template.xml
index fff74e1..4dc5b90 100644
--- a/intrastat_base/views/product_template.xml
+++ b/intrastat_base/views/product_template.xml
@@ -1,29 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2010-2019 Akretion France (http://www.akretion.com/)
   @author: Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
-
-<record id="product_template_form_view" model="ir.ui.view">
-    <field name="name">intrastat.base.product.template.form</field>
-    <field name="model">product.template</field>
-    <field name="inherit_id" ref="account.product_template_form_view"/>
-    <field name="arch" type="xml">
-        <group name="properties" position="after">
-            <group string="Intrastat Properties" name="intrastat">
-                <!-- If you need this field, inherit this view in a
+    <record id="product_template_form_view" model="ir.ui.view">
+        <field name="name">intrastat.base.product.template.form</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="account.product_template_form_view" />
+        <field name="arch" type="xml">
+            <group name="properties" position="after">
+                <group string="Intrastat Properties" name="intrastat">
+                    <!-- If you need this field, inherit this view in a
                 localisation module to set invisible="0" -->
-                <field name="is_accessory_cost"
-                    attrs="{'invisible': [('type', '!=', 'service')]}"
-                    invisible="1"/>
+                    <field
+                        name="is_accessory_cost"
+                        attrs="{'invisible': [('type', '!=', 'service')]}"
+                        invisible="1"
+                    />
+                </group>
             </group>
-        </group>
-    </field>
-</record>
-
-
+        </field>
+    </record>
 </odoo>
diff --git a/intrastat_base/views/res_config_settings.xml b/intrastat_base/views/res_config_settings.xml
index c62345e..3c1340b 100644
--- a/intrastat_base/views/res_config_settings.xml
+++ b/intrastat_base/views/res_config_settings.xml
@@ -1,27 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2013-2019 Akretion France (http://www.akretion.com/)
   @author: Alexis de Lattre <alexis.delattre@akretion.com>
   Copyright 2018 brain-tec AG (Kumar Aberer <kumar.aberer@braintec-group.com>)
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
     <record id="view_intrastat_res_config_settings" model="ir.ui.view">
         <field name="name">intrastat.res.config.settings.form</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">
             <xpath expr="//div[@id='analytic']" position="after">
                 <h2>Intrastat</h2>
                 <div class="row mt16 o_settings_container" id="intrastat">
                     <div class="col-xs-12 col-md-12 o_setting_box">
-                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_left_pane" />
                         <div class="o_setting_right_pane">
                             <div class="row">
-                                <label for="intrastat_remind_user_ids" class="col-md-5 o_light_label"/>
-                                <field name="intrastat_remind_user_ids" widget="many2many_tags"/>
+                                <label
+                                    for="intrastat_remind_user_ids"
+                                    class="col-md-5 o_light_label"
+                                />
+                                <field
+                                    name="intrastat_remind_user_ids"
+                                    widget="many2many_tags"
+                                />
                             </div>
                         </div>
                     </div>
@@ -29,6 +33,4 @@
             </xpath>
         </field>
     </record>
-
-
 </odoo>
diff --git a/intrastat_base/views/res_country.xml b/intrastat_base/views/res_country.xml
index 3ecc2fd..c0e1626 100644
--- a/intrastat_base/views/res_country.xml
+++ b/intrastat_base/views/res_country.xml
@@ -1,52 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2011-2016 Akretion France (http://www.akretion.com)
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
-
-<!-- Add intrastat field on res_country -->
-<record id="view_country_tree" model="ir.ui.view">
-    <field name="name">intrastat.base.country.tree</field>
-    <field name="model">res.country</field>
-    <field name="inherit_id" ref="base.view_country_tree" />
-    <field name="arch" type="xml">
-        <field name="code" position="after">
-            <field name="intrastat" />
+    <!-- Add intrastat field on res_country -->
+    <record id="view_country_tree" model="ir.ui.view">
+        <field name="name">intrastat.base.country.tree</field>
+        <field name="model">res.country</field>
+        <field name="inherit_id" ref="base.view_country_tree" />
+        <field name="arch" type="xml">
+            <field name="code" position="after">
+                <field name="intrastat" />
+            </field>
         </field>
-    </field>
-</record>
-
-<record id="view_country_form" model="ir.ui.view">
-    <field name="name">intrastat.base.country.form</field>
-    <field name="model">res.country</field>
-    <field name="inherit_id" ref="base.view_country_form" />
-    <field name="arch" type="xml">
-        <field name="code" position="after">
-            <field name="intrastat" />
+    </record>
+    <record id="view_country_form" model="ir.ui.view">
+        <field name="name">intrastat.base.country.form</field>
+        <field name="model">res.country</field>
+        <field name="inherit_id" ref="base.view_country_form" />
+        <field name="arch" type="xml">
+            <field name="code" position="after">
+                <field name="intrastat" />
+            </field>
         </field>
-    </field>
-</record>
-
-<!-- there is no native search view, so I can't inherit -->
-<record id="res_country_view_search" model="ir.ui.view">
-    <field name="name">intrastat.base.country.search</field>
-    <field name="model">res.country</field>
-    <field name="arch" type="xml">
-        <search string="Search Countries">
-            <field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', '=', self)]" string="Name or Code"/>
-            <field name="code" />
-            <field name="currency_id"/>
-            <filter name="intrastat" string="EU Country"
-                    domain="[('intrastat', '=', True)]" />
-            <group string="Group By" name="groupby">
-                <filter name="currency_groupby" string="Currency" context="{'group_by': 'currency_id'}"/>
-            </group>
-        </search>
-    </field>
-</record>
-
-
+    </record>
+    <!-- there is no native search view, so I can't inherit -->
+    <record id="res_country_view_search" model="ir.ui.view">
+        <field name="name">intrastat.base.country.search</field>
+        <field name="model">res.country</field>
+        <field name="arch" type="xml">
+            <search string="Search Countries">
+                <field
+                    name="name"
+                    filter_domain="['|', ('name', 'ilike', self), ('code', '=', self)]"
+                    string="Name or Code"
+                />
+                <field name="code" />
+                <field name="currency_id" />
+                <filter
+                    name="intrastat"
+                    string="EU Country"
+                    domain="[('intrastat', '=', True)]"
+                />
+                <group string="Group By" name="groupby">
+                    <filter
+                        name="currency_groupby"
+                        string="Currency"
+                        context="{'group_by': 'currency_id'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
 </odoo>
diff --git a/intrastat_base/views/res_partner.xml b/intrastat_base/views/res_partner.xml
index 5f31add..8c2f652 100644
--- a/intrastat_base/views/res_partner.xml
+++ b/intrastat_base/views/res_partner.xml
@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2010-2019 Akretion France (http://www.akretion.com/)
   @author David BEAL <david.beal@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
-<!-- Set country_id field to required on partner form view -->
-<record id="view_partner_form" model="ir.ui.view">
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form" />
-    <field name="arch" type="xml">
-        <xpath expr="//field[@name='country_id']" position="attributes">
-            <attribute name="required">1</attribute>
-        </xpath>
-        <xpath expr="//field[@name='child_ids']/form//field[@name='country_id']"
-               position="attributes">
-            <attribute name="required">1</attribute>
-        </xpath>
-    </field>
-</record>
-
+    <!-- Set country_id field to required on partner form view -->
+    <record id="view_partner_form" model="ir.ui.view">
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='country_id']" position="attributes">
+                <attribute name="required">1</attribute>
+            </xpath>
+            <xpath
+                expr="//field[@name='child_ids']/form//field[@name='country_id']"
+                position="attributes"
+            >
+                <attribute name="required">1</attribute>
+            </xpath>
+        </field>
+    </record>
 </odoo>