From cdfbc6bfc71da9b98eac76b59a9df8770f7cc6c0 Mon Sep 17 00:00:00 2001
From: Benjamin Henquet <benjamin.henquet@noviat.com>
Date: Wed, 11 Mar 2020 17:25:52 +0100
Subject: [PATCH] [13.0][FIX] 'number' for invoice does not exist anymore the
 account.move has attribute 'name'

---
 intrastat_product/__manifest__.py             |   2 +-
 .../data/intrastat_transport_mode.xml         |  63 +-
 intrastat_product/data/intrastat_unit.xml     | 127 ++--
 intrastat_product/demo/intrastat_demo.xml     |  31 +-
 .../models/intrastat_product_declaration.py   |  10 +-
 .../security/intrastat_security.xml           |  30 +-
 intrastat_product/views/account_move.xml      |  34 +-
 intrastat_product/views/hs_code.xml           |  41 +-
 .../views/intrastat_product_declaration.xml   | 591 ++++++++++--------
 intrastat_product/views/intrastat_region.xml  |  67 +-
 .../views/intrastat_transaction.xml           |  91 +--
 .../views/intrastat_transport_mode.xml        |  80 ++-
 intrastat_product/views/intrastat_unit.xml    |  58 +-
 .../views/res_config_settings.xml             | 176 +++---
 intrastat_product/views/sale_order.xml        |  32 +-
 intrastat_product/views/stock_warehouse.xml   |  18 +-
 16 files changed, 787 insertions(+), 664 deletions(-)

diff --git a/intrastat_product/__manifest__.py b/intrastat_product/__manifest__.py
index 8b79805..641b8eb 100644
--- a/intrastat_product/__manifest__.py
+++ b/intrastat_product/__manifest__.py
@@ -7,7 +7,7 @@
 
 {
     "name": "Intrastat Product",
-    "version": "13.0.1.0.0",
+    "version": "13.0.1.0.1",
     "category": "Intrastat",
     "license": "AGPL-3",
     "summary": "Base module for Intrastat Product",
diff --git a/intrastat_product/data/intrastat_transport_mode.xml b/intrastat_product/data/intrastat_transport_mode.xml
index bfab36e..002a1f1 100644
--- a/intrastat_product/data/intrastat_transport_mode.xml
+++ b/intrastat_product/data/intrastat_transport_mode.xml
@@ -1,50 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="intrastat_transport_1" model="intrastat.transport_mode">
-      <field name="code">1</field>
-      <field name="name">Sea</field>
-      <field name="description">Sea Transport (including wagons, motor vehicles, trailers, semi-trailers and lighters on board of a ship)</field>
+        <field name="code">1</field>
+        <field name="name">Sea</field>
+        <field
+            name="description"
+        >Sea Transport (including wagons, motor vehicles, trailers, semi-trailers and lighters on board of a ship)</field>
     </record>
     <record id="intrastat_transport_2" model="intrastat.transport_mode">
-      <field name="code">2</field>
-      <field name="name">Rail</field>
-      <field name="description">Railway transport (including lorries on railway wagons)</field>
+        <field name="code">2</field>
+        <field name="name">Rail</field>
+        <field
+            name="description"
+        >Railway transport (including lorries on railway wagons)</field>
     </record>
     <record id="intrastat_transport_3" model="intrastat.transport_mode">
-      <field name="code">3</field>
-      <field name="name">Road</field>
-      <field name="description">Road Transport</field>
+        <field name="code">3</field>
+        <field name="name">Road</field>
+        <field name="description">Road Transport</field>
     </record>
     <record id="intrastat_transport_4" model="intrastat.transport_mode">
-      <field name="code">4</field>
-      <field name="name">Air</field>
-      <field name="description">Air Transport</field>
+        <field name="code">4</field>
+        <field name="name">Air</field>
+        <field name="description">Air Transport</field>
     </record>
     <record id="intrastat_transport_5" model="intrastat.transport_mode">
-      <field name="code">5</field>
-      <field name="name">Post</field>
-      <field name="description">Postal consignments</field>
+        <field name="code">5</field>
+        <field name="name">Post</field>
+        <field name="description">Postal consignments</field>
     </record>
     <record id="intrastat_transport_7" model="intrastat.transport_mode">
-      <field name="code">7</field>
-      <field name="name">Fixed installations</field>
-      <field name="description">Fixed transport installations (e.g. pipelines, high-tension cables)</field>
+        <field name="code">7</field>
+        <field name="name">Fixed installations</field>
+        <field
+            name="description"
+        >Fixed transport installations (e.g. pipelines, high-tension cables)</field>
     </record>
     <record id="intrastat_transport_8" model="intrastat.transport_mode">
-      <field name="code">8</field>
-      <field name="name">Inland waterway</field>
-      <field name="description">Inland waterway transport</field>
+        <field name="code">8</field>
+        <field name="name">Inland waterway</field>
+        <field name="description">Inland waterway transport</field>
     </record>
     <record id="intrastat_transport_9" model="intrastat.transport_mode">
-      <field name="code">9</field>
-      <field name="name">Own propulsion</field>
-      <field name="description">Own propulsion (imported or exported means of transport crossing the border under their own power, e.g. aircraft, lorries, boats, etc.)</field>
+        <field name="code">9</field>
+        <field name="name">Own propulsion</field>
+        <field
+            name="description"
+        >Own propulsion (imported or exported means of transport crossing the border under their own power, e.g. aircraft, lorries, boats, etc.)</field>
     </record>
-
     <!-- Set default value to Road trp on main company -->
     <record id="base.main_company" model="res.company">
-        <field name="intrastat_transport_id" ref="intrastat_transport_3"/>
+        <field name="intrastat_transport_id" ref="intrastat_transport_3" />
     </record>
-
 </odoo>
diff --git a/intrastat_product/data/intrastat_unit.xml b/intrastat_product/data/intrastat_unit.xml
index 6d54164..bf67d39 100644
--- a/intrastat_product/data/intrastat_unit.xml
+++ b/intrastat_product/data/intrastat_unit.xml
@@ -1,123 +1,122 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <!-- Extracted from the Official Journal of the European Union -->
-
     <record id="intrastat_unit_c_k" model="intrastat.unit">
-      <field name="name">c/k</field>
-      <field name="description">Carats - 1 metric carat = 2 × 10exp(–4) kg</field>
+        <field name="name">c/k</field>
+        <field name="description">Carats - 1 metric carat = 2 × 10exp(–4) kg</field>
     </record>
     <record id="intrastat_unit_ce_el" model="intrastat.unit">
-      <field name="name">ce/el</field>
-      <field name="description">Number of cells</field>
+        <field name="name">ce/el</field>
+        <field name="description">Number of cells</field>
     </record>
     <record id="intrastat_unit_ct_l" model="intrastat.unit">
-      <field name="name">ct/l</field>
-      <field name="description">Carrying capacity in tonnes</field>
+        <field name="name">ct/l</field>
+        <field name="description">Carrying capacity in tonnes</field>
     </record>
     <record id="intrastat_unit_g" model="intrastat.unit">
-      <field name="name">g</field>
-      <field name="description">Gram</field>
-      <field name="uom_id" ref="uom.product_uom_gram"/>
+        <field name="name">g</field>
+        <field name="description">Gram</field>
+        <field name="uom_id" ref="uom.product_uom_gram" />
     </record>
     <record id="intrastat_unit_gi_FS" model="intrastat.unit">
-      <field name="name">gi F/S</field>
-      <field name="description">Gram of fissile isotopes</field>
+        <field name="name">gi F/S</field>
+        <field name="description">Gram of fissile isotopes</field>
     </record>
     <record id="intrastat_unit_kg_H2O2" model="intrastat.unit">
-      <field name="name">kg H2O2</field>
-      <field name="description">Kilogram of hydrogen peroxide</field>
+        <field name="name">kg H2O2</field>
+        <field name="description">Kilogram of hydrogen peroxide</field>
     </record>
     <record id="intrastat_unit_kg_K2O" model="intrastat.unit">
-      <field name="name">kg K2O</field>
-      <field name="description">Kilogram of potassium oxide</field>
+        <field name="name">kg K2O</field>
+        <field name="description">Kilogram of potassium oxide</field>
     </record>
     <record id="intrastat_unit_kg_KOH" model="intrastat.unit">
-      <field name="name">kg KOH</field>
-      <field name="description">Kilogram of potassium hydroxide (caustic potash)</field>
+        <field name="name">kg KOH</field>
+        <field
+            name="description"
+        >Kilogram of potassium hydroxide (caustic potash)</field>
     </record>
     <record id="intrastat_unit_kg_ma" model="intrastat.unit">
-      <field name="name">kg met.am.</field>
-      <field name="description">Kilogram of methylamines</field>
+        <field name="name">kg met.am.</field>
+        <field name="description">Kilogram of methylamines</field>
     </record>
     <record id="intrastat_unit_kg_N" model="intrastat.unit">
-      <field name="name">kg N</field>
-      <field name="description">Kilogram of nitrogen</field>
+        <field name="name">kg N</field>
+        <field name="description">Kilogram of nitrogen</field>
     </record>
     <record id="intrastat_unit_kg_NaOH" model="intrastat.unit">
-      <field name="name">kg NaOH</field>
-      <field name="description">Kilogram of sodium hydroxide (caustic soda)</field>
+        <field name="name">kg NaOH</field>
+        <field name="description">Kilogram of sodium hydroxide (caustic soda)</field>
     </record>
     <record id="intrastat_unit_kg_net_eda" model="intrastat.unit">
-      <field name="name">kg/net eda</field>
-      <field name="description">Kilogram drained net weight</field>
+        <field name="name">kg/net eda</field>
+        <field name="description">Kilogram drained net weight</field>
     </record>
     <record id="intrastat_unit_kg_P2O5" model="intrastat.unit">
-      <field name="name">kg P2O5</field>
-      <field name="description">Kilogram of diphosphorus pentaoxide</field>
+        <field name="name">kg P2O5</field>
+        <field name="description">Kilogram of diphosphorus pentaoxide</field>
     </record>
     <record id="intrastat_unit_kg_90_pct_sdt" model="intrastat.unit">
-      <field name="name">kg 90 pct sdt</field>
-      <field name="description">Kilogram of substance 90 % dry</field>
+        <field name="name">kg 90 pct sdt</field>
+        <field name="description">Kilogram of substance 90 % dry</field>
     </record>
     <record id="intrastat_unit_kg_U" model="intrastat.unit">
-      <field name="name">kg U</field>
-      <field name="description">Kilogram of uranium</field>
+        <field name="name">kg U</field>
+        <field name="description">Kilogram of uranium</field>
     </record>
     <record id="intrastat_unit_1000_kWh" model="intrastat.unit">
-      <field name="name">1000 kWh</field>
-      <field name="description">Thousand kilowatt hours</field>
+        <field name="name">1000 kWh</field>
+        <field name="description">Thousand kilowatt hours</field>
     </record>
     <record id="intrastat_unit_l" model="intrastat.unit">
-      <field name="name">l</field>
-      <field name="description">Litre</field>
-      <field name="uom_id" ref="uom.product_uom_litre"/>
+        <field name="name">l</field>
+        <field name="description">Litre</field>
+        <field name="uom_id" ref="uom.product_uom_litre" />
     </record>
     <record id="intrastat_unit_1000l" model="intrastat.unit">
-      <field name="name">1000 l</field>
-      <field name="description">Thousand litres</field>
+        <field name="name">1000 l</field>
+        <field name="description">Thousand litres</field>
     </record>
     <record id="intrastat_unit_l_alc_100_pct" model="intrastat.unit">
-      <field name="name">l alc. 100 pct</field>
-      <field name="description">Litre pure (100 %) alcohol</field>
+        <field name="name">l alc. 100 pct</field>
+        <field name="description">Litre pure (100 %) alcohol</field>
     </record>
     <record id="intrastat_unit_m" model="intrastat.unit">
-      <field name="name">m</field>
-      <field name="description">Metre</field>
-      <field name="uom_id" ref="uom.product_uom_meter"/>
+        <field name="name">m</field>
+        <field name="description">Metre</field>
+        <field name="uom_id" ref="uom.product_uom_meter" />
     </record>
     <record id="intrastat_unit_m2" model="intrastat.unit">
-      <field name="name">m2</field>
-      <field name="description">Square metre</field>
+        <field name="name">m2</field>
+        <field name="description">Square metre</field>
     </record>
     <record id="intrastat_unit_m3" model="intrastat.unit">
-      <field name="name">m3</field>
-      <field name="description">Cubic metre</field>
+        <field name="name">m3</field>
+        <field name="description">Cubic metre</field>
     </record>
     <record id="intrastat_unit_1000m3" model="intrastat.unit">
-      <field name="name">1000 m3</field>
-      <field name="description">Thousand cubic metres</field>
+        <field name="name">1000 m3</field>
+        <field name="description">Thousand cubic metres</field>
     </record>
     <record id="intrastat_unit_pa" model="intrastat.unit">
-      <field name="name">pa</field>
-      <field name="description">Number of pairs</field>
+        <field name="name">pa</field>
+        <field name="description">Number of pairs</field>
     </record>
     <record id="intrastat_unit_pce" model="intrastat.unit">
-      <field name="name">items</field>
-      <field name="description">Number of items</field>
-      <field name="uom_id" ref="uom.product_uom_unit"/>
+        <field name="name">items</field>
+        <field name="description">Number of items</field>
+        <field name="uom_id" ref="uom.product_uom_unit" />
     </record>
     <record id="intrastat_unit_100pce" model="intrastat.unit">
-      <field name="name">100 items</field>
-      <field name="description">Hundred items</field>
+        <field name="name">100 items</field>
+        <field name="description">Hundred items</field>
     </record>
     <record id="intrastat_unit_1000pce" model="intrastat.unit">
-      <field name="name">1000 items</field>
-      <field name="description">Thousand items</field>
+        <field name="name">1000 items</field>
+        <field name="description">Thousand items</field>
     </record>
     <record id="intrastat_unit_TJ" model="intrastat.unit">
-      <field name="name">TJ</field>
-      <field name="description">Terajoule (gross calorific value)</field>
+        <field name="name">TJ</field>
+        <field name="description">Terajoule (gross calorific value)</field>
     </record>
-
 </odoo>
diff --git a/intrastat_product/demo/intrastat_demo.xml b/intrastat_product/demo/intrastat_demo.xml
index dd85dae..7d51ef5 100644
--- a/intrastat_product/demo/intrastat_demo.xml
+++ b/intrastat_product/demo/intrastat_demo.xml
@@ -1,25 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   © 2011-2017 Akretion (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="product_harmonized_system.84715000" model="hs.code">
-    <field name="intrastat_unit_id" ref="intrastat_unit_pce"/>
-</record>
-
-<record id="product_harmonized_system.84717050" model="hs.code">
-    <field name="intrastat_unit_id" ref="intrastat_unit_pce"/>
-</record>
-
-<record id="base.main_company" model="res.company">
-    <field name="intrastat_arrivals">extended</field>
-    <field name="intrastat_dispatches">extended</field>
-    <field name="incoterm_id" ref="account.incoterm_DDU"/>
-    <field name="intrastat_transport_id" ref="intrastat_transport_3"/>
-</record>
-
+    <record id="product_harmonized_system.84715000" model="hs.code">
+        <field name="intrastat_unit_id" ref="intrastat_unit_pce" />
+    </record>
+    <record id="product_harmonized_system.84717050" model="hs.code">
+        <field name="intrastat_unit_id" ref="intrastat_unit_pce" />
+    </record>
+    <record id="base.main_company" model="res.company">
+        <field name="intrastat_arrivals">extended</field>
+        <field name="intrastat_dispatches">extended</field>
+        <field name="incoterm_id" ref="account.incoterm_DDU" />
+        <field name="intrastat_transport_id" ref="intrastat_transport_3" />
+    </record>
 </odoo>
diff --git a/intrastat_product/models/intrastat_product_declaration.py b/intrastat_product/models/intrastat_product_declaration.py
index 7661389..3423077 100644
--- a/intrastat_product/models/intrastat_product_declaration.py
+++ b/intrastat_product/models/intrastat_product_declaration.py
@@ -275,7 +275,7 @@ class IntrastatProductDeclaration(models.Model):
             note = "\n" + _(
                 "Missing unit of measure on the line with %d "
                 "product(s) '%s' on invoice '%s'."
-            ) % (line_qty, product.name_get()[0][1], invoice.number)
+            ) % (line_qty, product.name_get()[0][1], invoice.name)
             note += "\n" + _("Please adjust this line manually.")
             self._note += note
             return weight, suppl_unit_qty
@@ -546,7 +546,7 @@ class IntrastatProductDeclaration(models.Model):
                     _logger.info(
                         "Skipping invoice line %s qty %s "
                         "of invoice %s. Reason: qty = 0"
-                        % (inv_line.name, inv_line.quantity, invoice.number)
+                        % (inv_line.name, inv_line.quantity, invoice.name)
                     )
                     continue
 
@@ -555,7 +555,7 @@ class IntrastatProductDeclaration(models.Model):
                     _logger.info(
                         "Skipping invoice line %s qty %s "
                         "of invoice %s. Reason: no partner_country"
-                        % (inv_line.name, inv_line.quantity, invoice.number)
+                        % (inv_line.name, inv_line.quantity, invoice.name)
                     )
                     continue
 
@@ -566,7 +566,7 @@ class IntrastatProductDeclaration(models.Model):
                         "Skipping invoice line %s "
                         "qty %s of invoice %s. Reason: "
                         "tax.exclude_from_intrastat_if_present"
-                        % (inv_line.name, inv_line.quantity, invoice.number)
+                        % (inv_line.name, inv_line.quantity, invoice.name)
                     )
                     continue
 
@@ -588,7 +588,7 @@ class IntrastatProductDeclaration(models.Model):
                     _logger.info(
                         "Skipping invoice line %s qty %s "
                         "of invoice %s. Reason: no product nor hs_code"
-                        % (inv_line.name, inv_line.quantity, invoice.number)
+                        % (inv_line.name, inv_line.quantity, invoice.name)
                     )
                     continue
 
diff --git a/intrastat_product/security/intrastat_security.xml b/intrastat_product/security/intrastat_security.xml
index edae4dd..f4c714a 100644
--- a/intrastat_product/security/intrastat_security.xml
+++ b/intrastat_product/security/intrastat_security.xml
@@ -1,22 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="intrastat_transaction_company_rule" model="ir.rule">
-      <field name="name">Intrastat Transaction Company rule</field>
-      <field name="model_id" ref="model_intrastat_transaction"/>
-      <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+        <field name="name">Intrastat Transaction Company rule</field>
+        <field name="model_id" ref="model_intrastat_transaction" />
+        <field
+            name="domain_force"
+        >['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
     </record>
-
     <record id="intrastat_region_company_rule" model="ir.rule">
-      <field name="name">Intrastat Region Company rule</field>
-      <field name="model_id" ref="model_intrastat_region"/>
-      <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+        <field name="name">Intrastat Region Company rule</field>
+        <field name="model_id" ref="model_intrastat_region" />
+        <field
+            name="domain_force"
+        >['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
     </record>
-
     <record id="intrastat_product_declaration_company_rule" model="ir.rule">
-      <field name="name">Intrastat Product Declaration Company rule</field>
-      <field name="model_id" ref="model_intrastat_product_declaration"/>
-      <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+        <field name="name">Intrastat Product Declaration Company rule</field>
+        <field name="model_id" ref="model_intrastat_product_declaration" />
+        <field
+            name="domain_force"
+        >['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
     </record>
-
 </odoo>
diff --git a/intrastat_product/views/account_move.xml b/intrastat_product/views/account_move.xml
index 9f28158..3d2bd59 100644
--- a/intrastat_product/views/account_move.xml
+++ b/intrastat_product/views/account_move.xml
@@ -1,24 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_move_form" model="ir.ui.view">
         <field name="name">intrastat.invoice.form</field>
         <field name="model">account.move</field>
-        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='other_info']//field[@name='invoice_incoterm_id']" position="after">
-                <field name="intrastat_transaction_id"/>
-                <field name="intrastat" invisible="1"/>
-                <field name="intrastat_transport_id"
-                       attrs="{'invisible': [('intrastat', '!=', 'extended')]}"
-                       widget="selection"/>
-                <field name="src_dest_country_id" string="Destination Country"/>
-                <field name="src_dest_region_id" string="Origin Region" invisible="1"/>
+            <xpath
+                expr="//page[@name='other_info']//field[@name='invoice_incoterm_id']"
+                position="after"
+            >
+                <field name="intrastat_transaction_id" />
+                <field name="intrastat" invisible="1" />
+                <field
+                    name="intrastat_transport_id"
+                    attrs="{'invisible': [('intrastat', '!=', 'extended')]}"
+                    widget="selection"
+                />
+                <field name="src_dest_country_id" string="Destination Country" />
+                <field name="src_dest_region_id" string="Origin Region" invisible="1" />
             </xpath>
-            <xpath expr="//field[@name='invoice_line_ids']//field[@name='account_id']" position="after">
-                <field name="hs_code_id" invisible="1"/>
+            <xpath
+                expr="//field[@name='invoice_line_ids']//field[@name='account_id']"
+                position="after"
+            >
+                <field name="hs_code_id" invisible="1" />
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/intrastat_product/views/hs_code.xml b/intrastat_product/views/hs_code.xml
index a48d6c1..59d3165 100644
--- a/intrastat_product/views/hs_code.xml
+++ b/intrastat_product/views/hs_code.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   © 2010-2017 Akretion (http://www.akretion.com/)
   © 2015-2017 Noviat (http://www.noviat.com/)
@@ -6,37 +6,34 @@
   @author Luc De Meyer <luc.demeyer@noviat.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
     <!-- Add the H.S. code menu under the Intrastat Config menu -->
-    <menuitem id="intrastat_code_menu"
+    <menuitem
+        id="intrastat_code_menu"
         action="product_harmonized_system.hs_code_action"
         parent="intrastat_base.menu_intrastat_config_root"
-        sequence="10"/>
-
+        sequence="10"
+    />
     <!-- Inherit tree view of H.S. code -->
     <record id="hs_code_tree" model="ir.ui.view">
-      <field name="name">intrastat.hs.code.tree</field>
-      <field name="model">hs.code</field>
-      <field name="inherit_id" ref="product_harmonized_system.hs_code_view_tree"/>
-      <field name="arch" type="xml">
-        <field name="local_code" position="after">
-          <field name="intrastat_unit_id"/>
+        <field name="name">intrastat.hs.code.tree</field>
+        <field name="model">hs.code</field>
+        <field name="inherit_id" ref="product_harmonized_system.hs_code_view_tree" />
+        <field name="arch" type="xml">
+            <field name="local_code" position="after">
+                <field name="intrastat_unit_id" />
+            </field>
         </field>
-      </field>
     </record>
-
     <!-- Inherit form view for H.S. code -->
     <record id="hs_code_form" model="ir.ui.view">
-      <field name="name">intrastat.hs.code.form</field>
-      <field name="model">hs.code</field>
-      <field name="inherit_id" ref="product_harmonized_system.hs_code_view_form"/>
-      <field name="arch" type="xml">
-        <field name="local_code" position="after">
-          <field name="intrastat_unit_id"/>
+        <field name="name">intrastat.hs.code.form</field>
+        <field name="model">hs.code</field>
+        <field name="inherit_id" ref="product_harmonized_system.hs_code_view_form" />
+        <field name="arch" type="xml">
+            <field name="local_code" position="after">
+                <field name="intrastat_unit_id" />
+            </field>
         </field>
-      </field>
     </record>
-
 </odoo>
diff --git a/intrastat_product/views/intrastat_product_declaration.xml b/intrastat_product/views/intrastat_product_declaration.xml
index 095f14d..0a75377 100644
--- a/intrastat_product/views/intrastat_product_declaration.xml
+++ b/intrastat_product/views/intrastat_product_declaration.xml
@@ -1,277 +1,364 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
-
     <record id="intrastat_product_declaration_view_form" model="ir.ui.view">
-      <field name="name">intrastat.product.declaration.form</field>
-      <field name="model">intrastat.product.declaration</field>
-      <field name="arch" type="xml">
-        <form string="Intrastat Product Declaration">
-          <header>
-            <button name="action_gather" type="object"
-                    attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('action', '=', 'nihil')]}"
-                    string="Generate Lines from Invoices"
-                    class="oe_highlight"/>
-            <button name="generate_declaration" type="object"
-                    attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('action', '=', 'nihil')]}"
-                    string="Generate Declaration Lines"/>
-            <button name="generate_xml"
-                    string="Generate XML Declaration File"
-                    type="object"
-                    attrs="{'invisible': [('state', '!=', 'draft')]}"
-                    invisible="context.get('generic_intrastat_product_declaration')"/>
-            <button name="done" string="Done" type="object" class="oe_highlight" states="draft"/>
-            <button name="back2draft" string="Back to Draft" type="object" states="done"/>
-            <field name="state" widget="statusbar"/>
-          </header>
-          <sheet string="Intrastat Product Declaration">
-            <div class="oe_title">
-              <h1>
-                <span>Intrastat Product Declaration </span>
-                <field name="year_month" class="oe_inline"/>
-              </h1>
-            </div>
-            <group name="top-block">
-              <group name="properties-1">
-                <field name="year"/>
-                <field name="month"/>
-                <field name="type"/>
-                <field name="reporting_level" invisible="1"/>
-              </group>
-              <group name="properties-2">
-                <field name="action"/>
-                <field name="revision"/>
-                <field name="total_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                <field name="num_decl_lines"/>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                <field name="company_country_code" invisible="1"/>
-                <field name="currency_id" invisible="1"/>
-              </group>
-            </group>
-            <notebook>
-              <page string="Transactions">
+        <field name="name">intrastat.product.declaration.form</field>
+        <field name="model">intrastat.product.declaration</field>
+        <field name="arch" type="xml">
+            <form string="Intrastat Product Declaration">
                 <header>
-                  <button name="create_xls" type="object" string="Excel Export"
-                          context="{'computation_lines': 1}"/>
+                    <button
+                        name="action_gather"
+                        type="object"
+                        attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('action', '=', 'nihil')]}"
+                        string="Generate Lines from Invoices"
+                        class="oe_highlight"
+                    />
+                    <button
+                        name="generate_declaration"
+                        type="object"
+                        attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('action', '=', 'nihil')]}"
+                        string="Generate Declaration Lines"
+                    />
+                    <button
+                        name="generate_xml"
+                        string="Generate XML Declaration File"
+                        type="object"
+                        attrs="{'invisible': [('state', '!=', 'draft')]}"
+                        invisible="context.get('generic_intrastat_product_declaration')"
+                    />
+                    <button
+                        name="done"
+                        string="Done"
+                        type="object"
+                        class="oe_highlight"
+                        states="draft"
+                    />
+                    <button
+                        name="back2draft"
+                        string="Back to Draft"
+                        type="object"
+                        states="done"
+                    />
+                    <field name="state" widget="statusbar" />
                 </header>
-                <group name="computation_lines">
-                  <field name="computation_line_ids"
-                         context="{'type': type, 'reporting_level': reporting_level}"
-                         nolabel="1"/>
-                </group>
-              </page>
-              <page string="Declaration Lines">
-                <header>
-                  <button name="create_xls" type="object" string="Excel Export"
-                          context="{'declaration_lines': 1}"/>
-                </header>
-                <group name="declaration_lines">
-                  <field name="declaration_line_ids"
-                         context="{'type': type, 'reporting_level': reporting_level}"
-                         nolabel="1"/>
-                </group>
-              </page>
-              <page string="Notes">
-                <field name="note"/>
-              </page>
-            </notebook>
-          </sheet>
-          <div class="oe_chatter">
-            <field name="message_follower_ids" widget="mail_followers"/>
-            <field name="message_ids" widget="mail_thread"/>
-          </div>
-        </form>
-      </field>
+                <sheet string="Intrastat Product Declaration">
+                    <div class="oe_title">
+                        <h1>
+                            <span>Intrastat Product Declaration </span>
+                            <field name="year_month" class="oe_inline" />
+                        </h1>
+                    </div>
+                    <group name="top-block">
+                        <group name="properties-1">
+                            <field name="year" />
+                            <field name="month" />
+                            <field name="type" />
+                            <field name="reporting_level" invisible="1" />
+                        </group>
+                        <group name="properties-2">
+                            <field name="action" />
+                            <field name="revision" />
+                            <field
+                                name="total_amount"
+                                widget="monetary"
+                                options="{'currency_field': 'currency_id'}"
+                            />
+                            <field name="num_decl_lines" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                                widget="selection"
+                            />
+                            <field name="company_country_code" invisible="1" />
+                            <field name="currency_id" invisible="1" />
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Transactions">
+                            <header>
+                                <button
+                                    name="create_xls"
+                                    type="object"
+                                    string="Excel Export"
+                                    context="{'computation_lines': 1}"
+                                />
+                            </header>
+                            <group name="computation_lines">
+                                <field
+                                    name="computation_line_ids"
+                                    context="{'type': type, 'reporting_level': reporting_level}"
+                                    nolabel="1"
+                                />
+                            </group>
+                        </page>
+                        <page string="Declaration Lines">
+                            <header>
+                                <button
+                                    name="create_xls"
+                                    type="object"
+                                    string="Excel Export"
+                                    context="{'declaration_lines': 1}"
+                                />
+                            </header>
+                            <group name="declaration_lines">
+                                <field
+                                    name="declaration_line_ids"
+                                    context="{'type': type, 'reporting_level': reporting_level}"
+                                    nolabel="1"
+                                />
+                            </group>
+                        </page>
+                        <page string="Notes">
+                            <field name="note" />
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="message_ids" widget="mail_thread" />
+                </div>
+            </form>
+        </field>
     </record>
-
     <record id="intrastat_product_declaration_view_tree" model="ir.ui.view">
-      <field name="name">intrastat.product.declaration.tree</field>
-      <field name="model">intrastat.product.declaration</field>
-      <field name="arch" type="xml">
-        <tree string="Intrastat Product Declarations" decoration-info="state=='draft'">
-          <field name="year_month"/>
-          <field name="revision"/>
-          <field name="type"/>
-          <field name="num_decl_lines"/>
-          <field name="total_amount" sum="Total amount"/>
-          <field name="currency_id"/>
-          <field name="state"/>
-        </tree>
-      </field>
+        <field name="name">intrastat.product.declaration.tree</field>
+        <field name="model">intrastat.product.declaration</field>
+        <field name="arch" type="xml">
+            <tree
+                string="Intrastat Product Declarations"
+                decoration-info="state=='draft'"
+            >
+                <field name="year_month" />
+                <field name="revision" />
+                <field name="type" />
+                <field name="num_decl_lines" />
+                <field name="total_amount" sum="Total amount" />
+                <field name="currency_id" />
+                <field name="state" />
+            </tree>
+        </field>
     </record>
-
     <record id="intrastat_product_declaration_view_search" model="ir.ui.view">
-      <field name="name">intrastat.product.declaration.search</field>
-      <field name="model">intrastat.product.declaration</field>
-      <field name="arch" type="xml">
-        <search string="Search Intrastat Product Declarations">
-          <filter name="arrivals" string="Arrivals" domain="[('type', '=', 'arrivals')]"/>
-          <filter name="dispatches" string="Dispatches" domain="[('type', '=', 'dispatches')]"/>
-          <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]" />
-          <filter name="done" string="Done" domain="[('state', '=', 'done')]" />
-          <group string="Group By" name="group_by">
-            <filter name="date_group_by" string="Date" context="{'group_by': 'year_month'}" />
-            <filter name="type_group_by" string="Type" context="{'group_by': 'type'}" />
-          </group>
-        </search>
-      </field>
+        <field name="name">intrastat.product.declaration.search</field>
+        <field name="model">intrastat.product.declaration</field>
+        <field name="arch" type="xml">
+            <search string="Search Intrastat Product Declarations">
+                <filter
+                    name="arrivals"
+                    string="Arrivals"
+                    domain="[('type', '=', 'arrivals')]"
+                />
+                <filter
+                    name="dispatches"
+                    string="Dispatches"
+                    domain="[('type', '=', 'dispatches')]"
+                />
+                <filter
+                    name="draft"
+                    string="Draft"
+                    domain="[('state', '=', 'draft')]"
+                />
+                <filter name="done" string="Done" domain="[('state', '=', 'done')]" />
+                <group string="Group By" name="group_by">
+                    <filter
+                        name="date_group_by"
+                        string="Date"
+                        context="{'group_by': 'year_month'}"
+                    />
+                    <filter
+                        name="type_group_by"
+                        string="Type"
+                        context="{'group_by': 'type'}"
+                    />
+                </group>
+            </search>
+        </field>
     </record>
-
     <record id="intrastat_product_declaration_view_graph" model="ir.ui.view">
-      <field name="name">intrastat.product.declaration.graph</field>
-      <field name="model">intrastat.product.declaration</field>
-      <field name="arch" type="xml">
-        <graph string="Intrastat Product" type="bar" stacked="False">
-          <field name="year_month" type="row"/>
-          <field name="type" type="row"/>
-          <field name="total_amount" type="measure"/>
-        </graph>
-      </field>
+        <field name="name">intrastat.product.declaration.graph</field>
+        <field name="model">intrastat.product.declaration</field>
+        <field name="arch" type="xml">
+            <graph string="Intrastat Product" type="bar" stacked="False">
+                <field name="year_month" type="row" />
+                <field name="type" type="row" />
+                <field name="total_amount" type="measure" />
+            </graph>
+        </field>
     </record>
-
     <record id="intrastat_product_declaration_view_pivot" model="ir.ui.view">
-      <field name="name">intrastat.product.declaration.pivot</field>
-      <field name="model">intrastat.product.declaration</field>
-      <field name="arch" type="xml">
-        <pivot string="Intrastat Product">
-          <field name="year_month" type="row"/>
-          <field name="type" type="col"/>
-          <field name="total_amount" type="measure"/>
-        </pivot>
-      </field>
+        <field name="name">intrastat.product.declaration.pivot</field>
+        <field name="model">intrastat.product.declaration</field>
+        <field name="arch" type="xml">
+            <pivot string="Intrastat Product">
+                <field name="year_month" type="row" />
+                <field name="type" type="col" />
+                <field name="total_amount" type="measure" />
+            </pivot>
+        </field>
     </record>
-
-
     <!-- No menuitem nor action since these are provided by the localization modules -->
-
     <record id="intrastat_product_computation_line_view_form" model="ir.ui.view">
-      <field name="name">intrastat.product.computation.line.form</field>
-      <field name="model">intrastat.product.computation.line</field>
-      <field name="arch"  type="xml">
-        <form string="Intrastat Transaction">
-          <group string="Transaction" name="transaction">
-            <field name="parent_id"
-              invisible="not context.get('intrastat_product_computation_line_main_view')"/>
-            <field name="product_id"/>
-            <field name="hs_code_id"/>
-            <field name="src_dest_country_id" domain="[('intrastat', '=', True)]"/>
-            <field name="amount_company_currency"
-              widget="monetary"
-              options="{'currency_field': 'company_currency_id'}"/>
-            <field name="amount_accessory_cost_company_currency"
-              widget="monetary"
-              options="{'currency_field': 'company_currency_id'}"/>
-            <field name="company_currency_id" invisible="1"/>
-            <field name="transaction_id"/>
-            <label for="weight"/>
-            <div name="weight">
-                <field name="weight" class="oe_inline"/> Kg
+        <field name="name">intrastat.product.computation.line.form</field>
+        <field name="model">intrastat.product.computation.line</field>
+        <field name="arch" type="xml">
+            <form string="Intrastat Transaction">
+                <group string="Transaction" name="transaction">
+                    <field
+                        name="parent_id"
+                        invisible="not context.get('intrastat_product_computation_line_main_view')"
+                    />
+                    <field name="product_id" />
+                    <field name="hs_code_id" />
+                    <field
+                        name="src_dest_country_id"
+                        domain="[('intrastat', '=', True)]"
+                    />
+                    <field
+                        name="amount_company_currency"
+                        widget="monetary"
+                        options="{'currency_field': 'company_currency_id'}"
+                    />
+                    <field
+                        name="amount_accessory_cost_company_currency"
+                        widget="monetary"
+                        options="{'currency_field': 'company_currency_id'}"
+                    />
+                    <field name="company_currency_id" invisible="1" />
+                    <field name="transaction_id" />
+                    <label for="weight" />
+                    <div name="weight">
+                <field name="weight" class="oe_inline" /> Kg
             </div>
-            <field name="suppl_unit_qty"/>
-            <field name="intrastat_unit_id"/>
-            <field name="type" invisible="1"/>
-            <field name="reporting_level" invisible="1"/>
-            <field name="transport_id"
-              attrs="{'required': [('reporting_level', '=', 'extended')], 'invisible': [('reporting_level', '!=', 'extended')]}"/>
-            <field name="incoterm_id" invisible="1"/>
-            <field name="region_id" invisible="1"/>
-            <field name="product_origin_country_id" invisible="1"/>
-            <field name="invoice_id"/>
-          </group>
-          <group string="Declaration" name="declaration">
-            <field name="declaration_line_id"/>
-          </group>
-        </form>
-      </field>
+                    <field name="suppl_unit_qty" />
+                    <field name="intrastat_unit_id" />
+                    <field name="type" invisible="1" />
+                    <field name="reporting_level" invisible="1" />
+                    <field
+                        name="transport_id"
+                        attrs="{'required': [('reporting_level', '=', 'extended')], 'invisible': [('reporting_level', '!=', 'extended')]}"
+                    />
+                    <field name="incoterm_id" invisible="1" />
+                    <field name="region_id" invisible="1" />
+                    <field name="product_origin_country_id" invisible="1" />
+                    <field name="invoice_id" />
+                </group>
+                <group string="Declaration" name="declaration">
+                    <field name="declaration_line_id" />
+                </group>
+            </form>
+        </field>
     </record>
-
     <record id="intrastat_product_computation_line_view_tree" model="ir.ui.view">
-      <field name="name">intrastat.product.computation.line.tree</field>
-      <field name="model">intrastat.product.computation.line</field>
-      <field name="arch"  type="xml">
-        <tree string="Transactions">
-          <field name="parent_id"
-            invisible="not context.get('intrastat_product_computation_line_main_view')"/>
-          <field name="product_id"/>
-          <field name="hs_code_id"/>
-          <field name="src_dest_country_id" domain="[('intrastat', '=', True)]"/>
-          <field name="amount_company_currency"/>
-          <field name="amount_accessory_cost_company_currency"/>
-          <field name="transaction_id"/>
-          <field name="weight"/>
-          <field name="suppl_unit_qty"
-            attrs="{'invisible': [('intrastat_unit_id', '=', False)], 'required': [('intrastat_unit_id', '!=', False)]}"/>
-          <field name="intrastat_unit_id"/>
-          <field name="transport_id"
-            attrs="{'required': [('reporting_level', '=', 'extended')], 'invisible': [('reporting_level', '!=', 'extended')]}"/>
-          <field name="region_id" invisible="1"/>
-          <field name="product_origin_country_id" invisible="1" string="Product C/O"/>
-          <field name="invoice_id"/>
-          <field name="type" invisible="1"/>
-          <field name="reporting_level" invisible="1"/>
-        </tree>
-      </field>
+        <field name="name">intrastat.product.computation.line.tree</field>
+        <field name="model">intrastat.product.computation.line</field>
+        <field name="arch" type="xml">
+            <tree string="Transactions">
+                <field
+                    name="parent_id"
+                    invisible="not context.get('intrastat_product_computation_line_main_view')"
+                />
+                <field name="product_id" />
+                <field name="hs_code_id" />
+                <field name="src_dest_country_id" domain="[('intrastat', '=', True)]" />
+                <field name="amount_company_currency" />
+                <field name="amount_accessory_cost_company_currency" />
+                <field name="transaction_id" />
+                <field name="weight" />
+                <field
+                    name="suppl_unit_qty"
+                    attrs="{'invisible': [('intrastat_unit_id', '=', False)], 'required': [('intrastat_unit_id', '!=', False)]}"
+                />
+                <field name="intrastat_unit_id" />
+                <field
+                    name="transport_id"
+                    attrs="{'required': [('reporting_level', '=', 'extended')], 'invisible': [('reporting_level', '!=', 'extended')]}"
+                />
+                <field name="region_id" invisible="1" />
+                <field
+                    name="product_origin_country_id"
+                    invisible="1"
+                    string="Product C/O"
+                />
+                <field name="invoice_id" />
+                <field name="type" invisible="1" />
+                <field name="reporting_level" invisible="1" />
+            </tree>
+        </field>
     </record>
-
     <record id="intrastat_product_declaration_line_view_form" model="ir.ui.view">
-      <field name="name">intrastat.product.declaration.line.form</field>
-      <field name="model">intrastat.product.declaration.line</field>
-      <field name="arch"  type="xml">
-        <form string="Intrastat Declaration Line">
-          <group name="declaration">
-            <field name="parent_id"
-              invisible="not context.get('intrastat_product_declaration_line_main_view')"/>
-            <field name="hs_code_id"/>
-            <field name="src_dest_country_id" domain="[('intrastat', '=', True)]"/>
-            <field name="amount_company_currency"
-              widget="monetary"
-              options="{'currency_field': 'company_currency_id'}"/>
-            <field name="company_currency_id" invisible="1"/>
-            <field name="transaction_id"/>
-            <label for="weight"/>
-            <div name="weight">
-                <field name="weight" class="oe_inline"/> Kg
+        <field name="name">intrastat.product.declaration.line.form</field>
+        <field name="model">intrastat.product.declaration.line</field>
+        <field name="arch" type="xml">
+            <form string="Intrastat Declaration Line">
+                <group name="declaration">
+                    <field
+                        name="parent_id"
+                        invisible="not context.get('intrastat_product_declaration_line_main_view')"
+                    />
+                    <field name="hs_code_id" />
+                    <field
+                        name="src_dest_country_id"
+                        domain="[('intrastat', '=', True)]"
+                    />
+                    <field
+                        name="amount_company_currency"
+                        widget="monetary"
+                        options="{'currency_field': 'company_currency_id'}"
+                    />
+                    <field name="company_currency_id" invisible="1" />
+                    <field name="transaction_id" />
+                    <label for="weight" />
+                    <div name="weight">
+                <field name="weight" class="oe_inline" /> Kg
             </div>
-            <field name="suppl_unit_qty"/>
-            <field name="intrastat_unit_id"/>
-            <field name="type" invisible="1"/>
-            <field name="reporting_level" invisible="1"/>
-            <field name="transport_id"
-              attrs="{'required': [('reporting_level', '=', 'extended')], 'invisible': [('reporting_level', '!=', 'extended')]}"/>
-            <field name="region_id" invisible="1"/>
-            <field name="incoterm_id" invisible="1"/>
-            <field name="product_origin_country_id" invisible="1"/>
-          </group>
-          <group name="computation" string="Related Transactions">
-            <field name="computation_line_ids" nolabel="1"/>
-          </group>
-        </form>
-      </field>
+                    <field name="suppl_unit_qty" />
+                    <field name="intrastat_unit_id" />
+                    <field name="type" invisible="1" />
+                    <field name="reporting_level" invisible="1" />
+                    <field
+                        name="transport_id"
+                        attrs="{'required': [('reporting_level', '=', 'extended')], 'invisible': [('reporting_level', '!=', 'extended')]}"
+                    />
+                    <field name="region_id" invisible="1" />
+                    <field name="incoterm_id" invisible="1" />
+                    <field name="product_origin_country_id" invisible="1" />
+                </group>
+                <group name="computation" string="Related Transactions">
+                    <field name="computation_line_ids" nolabel="1" />
+                </group>
+            </form>
+        </field>
     </record>
-
     <record id="intrastat_product_declaration_line_view_tree" model="ir.ui.view">
-      <field name="name">intrastat.product.declaration.line.tree</field>
-      <field name="model">intrastat.product.declaration.line</field>
-      <field name="arch"  type="xml">
-        <tree string="Intrastat Declaration Lines">
-          <field name="parent_id"
-            invisible="not context.get('intrastat_product_declaration_line_main_view')"/>
-          <field name="hs_code_id"/>
-          <field name="src_dest_country_id" domain="[('intrastat', '=', True)]"/>
-          <field name="amount_company_currency"/>
-          <field name="transaction_id"/>
-          <field name="weight"/>
-          <field name="suppl_unit_qty"/>
-          <field name="intrastat_unit_id"/>
-          <field name="type" invisible="1"/>
-          <field name="reporting_level" invisible="1"/>
-          <field name="transport_id"
-            attrs="{'required': [('reporting_level', '=', 'extended')], 'invisible': [('reporting_level', '!=', 'extended')]}"/>
-          <field name="region_id" invisible="1"/>
-          <field name="incoterm_id" invisible="1"/>
-          <field name="product_origin_country_id" invisible="1" string="Product C/O"/>
-        </tree>
-      </field>
+        <field name="name">intrastat.product.declaration.line.tree</field>
+        <field name="model">intrastat.product.declaration.line</field>
+        <field name="arch" type="xml">
+            <tree string="Intrastat Declaration Lines">
+                <field
+                    name="parent_id"
+                    invisible="not context.get('intrastat_product_declaration_line_main_view')"
+                />
+                <field name="hs_code_id" />
+                <field name="src_dest_country_id" domain="[('intrastat', '=', True)]" />
+                <field name="amount_company_currency" />
+                <field name="transaction_id" />
+                <field name="weight" />
+                <field name="suppl_unit_qty" />
+                <field name="intrastat_unit_id" />
+                <field name="type" invisible="1" />
+                <field name="reporting_level" invisible="1" />
+                <field
+                    name="transport_id"
+                    attrs="{'required': [('reporting_level', '=', 'extended')], 'invisible': [('reporting_level', '!=', 'extended')]}"
+                />
+                <field name="region_id" invisible="1" />
+                <field name="incoterm_id" invisible="1" />
+                <field
+                    name="product_origin_country_id"
+                    invisible="1"
+                    string="Product C/O"
+                />
+            </tree>
+        </field>
     </record>
-
-
 </odoo>
diff --git a/intrastat_product/views/intrastat_region.xml b/intrastat_product/views/intrastat_region.xml
index 648209f..a412c26 100644
--- a/intrastat_product/views/intrastat_region.xml
+++ b/intrastat_product/views/intrastat_region.xml
@@ -1,44 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="intrastat_region_view_form" model="ir.ui.view">
-      <field name="name">intrastat.region.form</field>
-      <field name="model">intrastat.region</field>
-      <field name="arch" type="xml">
-        <form string="Intrastat Region">
-          <group>
-            <field name="code"/>
-            <field name="name"/>
-            <field name="description"/>
-            <field name="country_id"/>
-            <field name="company_id" groups="base.group_multi_company"/>
-          </group>
-        </form>
-      </field>
+        <field name="name">intrastat.region.form</field>
+        <field name="model">intrastat.region</field>
+        <field name="arch" type="xml">
+            <form string="Intrastat Region">
+                <group>
+                    <field name="code" />
+                    <field name="name" />
+                    <field name="description" />
+                    <field name="country_id" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                </group>
+            </form>
+        </field>
     </record>
-
     <record id="intrastat_region_view_tree" model="ir.ui.view">
-      <field name="name">intrastat.region.tree</field>
-      <field name="model">intrastat.region</field>
-      <field name="arch" type="xml">
-        <tree string="Intrastat Region">
-          <field name="code"/>
-          <field name="name"/>
-          <field name="description"/>
-          <field name="country_id"/>
-          <field name="company_id" groups="base.group_multi_company"/>
-        </tree>
-      </field>
+        <field name="name">intrastat.region.tree</field>
+        <field name="model">intrastat.region</field>
+        <field name="arch" type="xml">
+            <tree string="Intrastat Region">
+                <field name="code" />
+                <field name="name" />
+                <field name="description" />
+                <field name="country_id" />
+                <field name="company_id" groups="base.group_multi_company" />
+            </tree>
+        </field>
     </record>
-
     <record id="intrastat_region_action" model="ir.actions.act_window">
-      <field name="name">Intrastat Regions</field>
-      <field name="res_model">intrastat.region</field>
-      <field name="view_mode">tree,form</field>
+        <field name="name">Intrastat Regions</field>
+        <field name="res_model">intrastat.region</field>
+        <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem id="intrastat_region_menu"
+    <menuitem
+        id="intrastat_region_menu"
         action="intrastat_region_action"
-        parent="intrastat_base.menu_intrastat_config_root"/>
-
+        parent="intrastat_base.menu_intrastat_config_root"
+    />
 </odoo>
diff --git a/intrastat_product/views/intrastat_transaction.xml b/intrastat_product/views/intrastat_transaction.xml
index c1c319d..0b1b719 100644
--- a/intrastat_product/views/intrastat_transaction.xml
+++ b/intrastat_product/views/intrastat_transaction.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   © 2010-2017 Akretion (http://www.akretion.com/)
   © 2015-2017 Noviat (http://www.noviat.com/)
@@ -6,60 +6,61 @@
   @author Luc De Meyer <luc.demeyer@noviat.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
     <!-- Intrastat Transaction Type -->
     <record id="intrastat_transaction_form" model="ir.ui.view">
-      <field name="name">intrastat.transaction_form</field>
-      <field name="model">intrastat.transaction</field>
-      <field name="arch" type="xml">
-        <form string="Intrastat Transaction Type">
-          <group>
-            <field name="code"/>
-            <field name="description"/>
-            <field name="company_id" groups="base.group_multi_company"/>
-          </group>
-        </form>
-      </field>
+        <field name="name">intrastat.transaction_form</field>
+        <field name="model">intrastat.transaction</field>
+        <field name="arch" type="xml">
+            <form string="Intrastat Transaction Type">
+                <group>
+                    <field name="code" />
+                    <field name="description" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                </group>
+            </form>
+        </field>
     </record>
-
     <record id="intrastat_transaction_tree" model="ir.ui.view">
-      <field name="name">intrastat.transaction_tree</field>
-      <field name="model">intrastat.transaction</field>
-      <field name="arch" type="xml">
-        <tree string="Intrastat Transaction Types">
-          <field name="code"/>
-          <field name="description"/>
-          <field name="company_id" groups="base.group_multi_company"/>
-        </tree>
-      </field>
+        <field name="name">intrastat.transaction_tree</field>
+        <field name="model">intrastat.transaction</field>
+        <field name="arch" type="xml">
+            <tree string="Intrastat Transaction Types">
+                <field name="code" />
+                <field name="description" />
+                <field name="company_id" groups="base.group_multi_company" />
+            </tree>
+        </field>
     </record>
-
     <record id="intrastat_transaction_mode_search" model="ir.ui.view">
-      <field name="name">intrastat.transaction.mode.search</field>
-      <field name="model">intrastat.transaction</field>
-      <field name="arch" type="xml">
-        <search string="Search Intrastat Transaction Types">
-          <field name="description" string="Code or Description"
-            filter_domain="['|', ('code', 'ilike', self), ('description', 'ilike', self)]"/>
-            <group string="Group By" name="groupby">
-                <filter name="company_groupby" string="Company"
-                    context="{'group_by': 'company_id'}"/>
-            </group>
-        </search>
-      </field>
+        <field name="name">intrastat.transaction.mode.search</field>
+        <field name="model">intrastat.transaction</field>
+        <field name="arch" type="xml">
+            <search string="Search Intrastat Transaction Types">
+                <field
+                    name="description"
+                    string="Code or Description"
+                    filter_domain="['|', ('code', 'ilike', self), ('description', 'ilike', self)]"
+                />
+                <group string="Group By" name="groupby">
+                    <filter
+                        name="company_groupby"
+                        string="Company"
+                        context="{'group_by': 'company_id'}"
+                    />
+                </group>
+            </search>
+        </field>
     </record>
-
     <record id="intrastat_transaction_action" model="ir.actions.act_window">
-      <field name="name">Transaction Types</field>
-      <field name="res_model">intrastat.transaction</field>
-      <field name="view_mode">tree,form</field>
+        <field name="name">Transaction Types</field>
+        <field name="res_model">intrastat.transaction</field>
+        <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem id="intrastat_transaction_menu"
+    <menuitem
+        id="intrastat_transaction_menu"
         action="intrastat_transaction_action"
         parent="intrastat_base.menu_intrastat_config_root"
-        sequence="20"/>
-
+        sequence="20"
+    />
 </odoo>
diff --git a/intrastat_product/views/intrastat_transport_mode.xml b/intrastat_product/views/intrastat_transport_mode.xml
index 6398a82..f23f0a6 100644
--- a/intrastat_product/views/intrastat_transport_mode.xml
+++ b/intrastat_product/views/intrastat_transport_mode.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   © 2010-2017 Akretion (http://www.akretion.com/)
   © 2015-2017 Noviat (http://www.noviat.com/)
@@ -6,56 +6,54 @@
   @author Luc De Meyer <luc.demeyer@noviat.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
     <!-- Intrastat Transport Mode -->
     <record id="intrastat_transport_mode_form" model="ir.ui.view">
-      <field name="name">intrastat.transport.mode.form</field>
-      <field name="model">intrastat.transport_mode</field>
-      <field name="arch" type="xml">
-        <form string="Intrastat Transport Mode">
-          <group>
-            <field name="name"/>
-            <field name="code"/>
-            <field name="description"/>
-          </group>
-        </form>
-      </field>
+        <field name="name">intrastat.transport.mode.form</field>
+        <field name="model">intrastat.transport_mode</field>
+        <field name="arch" type="xml">
+            <form string="Intrastat Transport Mode">
+                <group>
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="description" />
+                </group>
+            </form>
+        </field>
     </record>
-
     <record id="intrastat_transport_mode_tree" model="ir.ui.view">
-      <field name="name">intrastat.transport.mode.tree</field>
-      <field name="model">intrastat.transport_mode</field>
-      <field name="arch" type="xml">
-        <tree string="Intrastat Transportat Modes">
-          <field name="code"/>
-          <field name="name"/>
-          <field name="description"/>
-        </tree>
-      </field>
+        <field name="name">intrastat.transport.mode.tree</field>
+        <field name="model">intrastat.transport_mode</field>
+        <field name="arch" type="xml">
+            <tree string="Intrastat Transportat Modes">
+                <field name="code" />
+                <field name="name" />
+                <field name="description" />
+            </tree>
+        </field>
     </record>
-
     <record id="intrastat_transport_mode_search" model="ir.ui.view">
-      <field name="name">intrastat.transport.mode.search</field>
-      <field name="model">intrastat.transport_mode</field>
-      <field name="arch" type="xml">
-        <search string="Search Intrastat Transport Modes">
-          <field name="name" string="Name, Code or Description"
-              filter_domain="['|', '|', ('name', 'ilike', self), ('description', 'ilike', self), ('code', 'ilike', self)]"/>
-        </search>
-      </field>
+        <field name="name">intrastat.transport.mode.search</field>
+        <field name="model">intrastat.transport_mode</field>
+        <field name="arch" type="xml">
+            <search string="Search Intrastat Transport Modes">
+                <field
+                    name="name"
+                    string="Name, Code or Description"
+                    filter_domain="['|', '|', ('name', 'ilike', self), ('description', 'ilike', self), ('code', 'ilike', self)]"
+                />
+            </search>
+        </field>
     </record>
-
     <record id="intrastat_transport_action" model="ir.actions.act_window">
-      <field name="name">Transport Modes</field>
-      <field name="res_model">intrastat.transport_mode</field>
-      <field name="view_mode">tree,form</field>
+        <field name="name">Transport Modes</field>
+        <field name="res_model">intrastat.transport_mode</field>
+        <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem id="intrastat_transport_menu"
+    <menuitem
+        id="intrastat_transport_menu"
         action="intrastat_transport_action"
         parent="intrastat_base.menu_intrastat_config_root"
-        sequence="30"/>
-
+        sequence="30"
+    />
 </odoo>
diff --git a/intrastat_product/views/intrastat_unit.xml b/intrastat_product/views/intrastat_unit.xml
index 073b7ca..e340fab 100644
--- a/intrastat_product/views/intrastat_unit.xml
+++ b/intrastat_product/views/intrastat_unit.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   © 2010-2017 Akretion (http://www.akretion.com/)
   © 2015-2017 Noviat (http://www.noviat.com/)
@@ -6,66 +6,72 @@
   @author Luc De Meyer <luc.demeyer@noviat.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
     <!-- Intrastat Supplementary Unit -->
     <record id="intrastat_unit_form" model="ir.ui.view">
         <field name="name">intrastat.unit.form</field>
         <field name="model">intrastat.unit</field>
         <field name="arch" type="xml">
             <form string="Intrastat Supplementary Unit">
-                <field name="active" invisible="1"/>
-                <widget name="web_ribbon" text="Archived"
-                        bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"/>
+                <field name="active" invisible="1" />
+                <widget
+                    name="web_ribbon"
+                    text="Archived"
+                    bg_color="bg-danger"
+                    attrs="{'invisible': [('active', '=', True)]}"
+                />
                 <group name="main">
-                    <field name="name"/>
-                    <field name="uom_id" required="1"/>
-                    <field name="description"/>
+                    <field name="name" />
+                    <field name="uom_id" required="1" />
+                    <field name="description" />
                 </group>
             </form>
         </field>
     </record>
-
     <record id="intrastat_unit_tree" model="ir.ui.view">
         <field name="name">intrastat.unit.tree</field>
         <field name="model">intrastat.unit</field>
         <field name="arch" type="xml">
             <tree string="Intrastat Supplementary Units">
-                <field name="name"/>
-                <field name="uom_id"/>
-                <field name="description"/>
+                <field name="name" />
+                <field name="uom_id" />
+                <field name="description" />
             </tree>
         </field>
     </record>
-
     <record id="intrastat_unit_search" model="ir.ui.view">
         <field name="name">intrastat.unit.search</field>
         <field name="model">intrastat.unit</field>
         <field name="arch" type="xml">
             <search string="Search Intrastat Supplementary Units">
-                <field name="name"
-                        filter_domain="['|', ('name', 'ilike', self), ('description', 'ilike', self)]"/>
-                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                <field
+                    name="name"
+                    filter_domain="['|', ('name', 'ilike', self), ('description', 'ilike', self)]"
+                />
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active', '=', False)]"
+                />
                 <group string="Group By" name="groupby">
-                    <filter name="uom_groupby" string="Regular UoM"
-                        context="{'group_by': 'uom_id'}"/>
+                    <filter
+                        name="uom_groupby"
+                        string="Regular UoM"
+                        context="{'group_by': 'uom_id'}"
+                    />
                 </group>
             </search>
         </field>
     </record>
-
-
     <record id="intrastat_unit_action" model="ir.actions.act_window">
         <field name="name">Supplementary Units</field>
         <field name="res_model">intrastat.unit</field>
         <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem id="intrastat_unit_menu"
+    <menuitem
+        id="intrastat_unit_menu"
         action="intrastat_unit_action"
         parent="intrastat_base.menu_intrastat_config_root"
-        sequence="40"/>
-
+        sequence="40"
+    />
 </odoo>
diff --git a/intrastat_product/views/res_config_settings.xml b/intrastat_product/views/res_config_settings.xml
index f548e2b..3b3a9b7 100644
--- a/intrastat_product/views/res_config_settings.xml
+++ b/intrastat_product/views/res_config_settings.xml
@@ -1,78 +1,112 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <!--
   © 2018 brain-tec AG (Kumar Aberer <kumar.aberer@braintec-group.com>)
   © 2019 Noviat (www.noviat.com)
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 <odoo>
-
-  <record id="view_res_config_settings" model="ir.ui.view">
-    <field name="name">intrastat.account.config.settings.form</field>
-    <field name="model">res.config.settings</field>
-    <field name="inherit_id" ref="intrastat_base.view_intrastat_res_config_settings"/>
-    <field name="arch" type="xml">
-
-      <xpath expr="//div[@id='intrastat']" position="after">
-
-        <field name="country_id" invisible="1"/>
-        <field name="country_code" invisible="1"/>
-
-        <div class="row mt16 o_settings_container" id="intrastat-product">
-
-          <div class="col-xs-12 col-md-12 o_setting_box">
-            <div class="o_setting_left_pane"/>
-            <div class="o_setting_right_pane" id="intrastat-product-main-params">
-              <div class="row">
-                <label for="intrastat_arrivals" class="col-md-5 o_light_label"/>
-                <field name="intrastat_arrivals"/>
-              </div>
-              <div class="row">
-                <label for="intrastat_dispatches" class="col-md-5 o_light_label"/>
-                <field name="intrastat_dispatches"/>
-              </div>
-              <div class="row">
-                <label for="intrastat_transport_id" class="col-md-5 o_light_label"/>
-                <field name="intrastat_transport_id"/>
-              </div>
-              <div class="row">
-                <label for="intrastat_transaction_out_invoice" class="col-md-5 o_light_label"/>
-                <field name="intrastat_transaction_out_invoice"/>
-              </div>
-              <div class="row">
-                <label for="intrastat_transaction_out_refund" class="col-md-5 o_light_label"/>
-                <field name="intrastat_transaction_out_refund"/>
-              </div>
-              <div class="row">
-                <label for="intrastat_transaction_in_invoice" class="col-md-5 o_light_label"/>
-                <field name="intrastat_transaction_in_invoice"/>
-              </div>
-              <div class="row" attrs="{'invisible': [('country_code', 'in', ['FR'])]}">
-                <label for="intrastat_transaction_in_refund" class="col-md-5 o_light_label"/>
-                <field name="intrastat_transaction_in_refund"/>
-              </div>
-              <div class="row" attrs="{'invisible': [('country_code', 'not in', ['BE'])]}">
-                <label for="intrastat_region_id" class="col-md-5 o_light_label"/>
-                <field name="intrastat_region_id" domain="[('country_id','=', country_id)]"/>
-              </div>
-            </div>
-
-            <div class="o_setting_left_pane">
-              <field name="intrastat_accessory_costs"
-                     attrs="{'invisible': [('country_code', 'in', ['BE'])]}"/>
-            </div>
-            <div class="o_setting_right_pane">
-              <div class="row">
-                <label for="intrastat_accessory_costs" class="col-md-12 o_light_label"
-                       attrs="{'invisible': [('country_code', 'in', ['BE'])]}"/>
-              </div>
-            </div>
-
-          </div>
-        </div>
-
-      </xpath>
-
-    </field>
-  </record>
-
+    <record id="view_res_config_settings" model="ir.ui.view">
+        <field name="name">intrastat.account.config.settings.form</field>
+        <field name="model">res.config.settings</field>
+        <field
+            name="inherit_id"
+            ref="intrastat_base.view_intrastat_res_config_settings"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='intrastat']" position="after">
+                <field name="country_id" invisible="1" />
+                <field name="country_code" invisible="1" />
+                <div class="row mt16 o_settings_container" id="intrastat-product">
+                    <div class="col-xs-12 col-md-12 o_setting_box">
+                        <div class="o_setting_left_pane" />
+                        <div
+                            class="o_setting_right_pane"
+                            id="intrastat-product-main-params"
+                        >
+                            <div class="row">
+                                <label
+                                    for="intrastat_arrivals"
+                                    class="col-md-5 o_light_label"
+                                />
+                                <field name="intrastat_arrivals" />
+                            </div>
+                            <div class="row">
+                                <label
+                                    for="intrastat_dispatches"
+                                    class="col-md-5 o_light_label"
+                                />
+                                <field name="intrastat_dispatches" />
+                            </div>
+                            <div class="row">
+                                <label
+                                    for="intrastat_transport_id"
+                                    class="col-md-5 o_light_label"
+                                />
+                                <field name="intrastat_transport_id" />
+                            </div>
+                            <div class="row">
+                                <label
+                                    for="intrastat_transaction_out_invoice"
+                                    class="col-md-5 o_light_label"
+                                />
+                                <field name="intrastat_transaction_out_invoice" />
+                            </div>
+                            <div class="row">
+                                <label
+                                    for="intrastat_transaction_out_refund"
+                                    class="col-md-5 o_light_label"
+                                />
+                                <field name="intrastat_transaction_out_refund" />
+                            </div>
+                            <div class="row">
+                                <label
+                                    for="intrastat_transaction_in_invoice"
+                                    class="col-md-5 o_light_label"
+                                />
+                                <field name="intrastat_transaction_in_invoice" />
+                            </div>
+                            <div
+                                class="row"
+                                attrs="{'invisible': [('country_code', 'in', ['FR'])]}"
+                            >
+                                <label
+                                    for="intrastat_transaction_in_refund"
+                                    class="col-md-5 o_light_label"
+                                />
+                                <field name="intrastat_transaction_in_refund" />
+                            </div>
+                            <div
+                                class="row"
+                                attrs="{'invisible': [('country_code', 'not in', ['BE'])]}"
+                            >
+                                <label
+                                    for="intrastat_region_id"
+                                    class="col-md-5 o_light_label"
+                                />
+                                <field
+                                    name="intrastat_region_id"
+                                    domain="[('country_id','=', country_id)]"
+                                />
+                            </div>
+                        </div>
+                        <div class="o_setting_left_pane">
+                            <field
+                                name="intrastat_accessory_costs"
+                                attrs="{'invisible': [('country_code', 'in', ['BE'])]}"
+                            />
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <div class="row">
+                                <label
+                                    for="intrastat_accessory_costs"
+                                    class="col-md-12 o_light_label"
+                                    attrs="{'invisible': [('country_code', 'in', ['BE'])]}"
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
 </odoo>
diff --git a/intrastat_product/views/sale_order.xml b/intrastat_product/views/sale_order.xml
index 4e3a5cd..74fb4ee 100644
--- a/intrastat_product/views/sale_order.xml
+++ b/intrastat_product/views/sale_order.xml
@@ -1,20 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
-
-
-<record id="sale_order_form" model="ir.ui.view">
-      <field name="name">intrastat.sale.order.form</field>
-      <field name="model">sale.order</field>
-      <field name="inherit_id" ref="sale_stock.view_order_form_inherit_sale_stock"/>
-      <field name="arch" type="xml">
-        <field name="incoterm" position="after">
-          <field name="intrastat_transport_id"
-                 attrs="{'invisible': [('intrastat', '!=', 'extended')]}"
-                 widget="selection"/>
-          <field name="intrastat" invisible="1"/>
+    <record id="sale_order_form" model="ir.ui.view">
+        <field name="name">intrastat.sale.order.form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale_stock.view_order_form_inherit_sale_stock" />
+        <field name="arch" type="xml">
+            <field name="incoterm" position="after">
+                <field
+                    name="intrastat_transport_id"
+                    attrs="{'invisible': [('intrastat', '!=', 'extended')]}"
+                    widget="selection"
+                />
+                <field name="intrastat" invisible="1" />
+            </field>
         </field>
-      </field>
-</record>
-
-
+    </record>
 </odoo>
diff --git a/intrastat_product/views/stock_warehouse.xml b/intrastat_product/views/stock_warehouse.xml
index f9b1825..7de0626 100644
--- a/intrastat_product/views/stock_warehouse.xml
+++ b/intrastat_product/views/stock_warehouse.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
-
     <record id="view_warehouse" model="ir.ui.view">
-      <field name="name">intrastat.stock.warehouse.form</field>
-      <field name="model">stock.warehouse</field>
-      <field name="inherit_id" ref="stock.view_warehouse"/>
-      <field name="arch" type="xml">
-        <field name="partner_id" position="after">
-          <field name="region_id"/>
+        <field name="name">intrastat.stock.warehouse.form</field>
+        <field name="model">stock.warehouse</field>
+        <field name="inherit_id" ref="stock.view_warehouse" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="region_id" />
+            </field>
         </field>
-      </field>
     </record>
-
 </odoo>