diff --git a/.editorconfig b/.editorconfig
index 62276b0..bfd7ac5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,11 +7,11 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[.eslintrc,*.{json,yml,yaml,rst,md}]
+[*.{json,yml,yaml,rst,md}]
 indent_size = 2
 
 # Do not configure editor for libs and autogenerated content
-[*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst]
+[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}]
 charset = unset
 end_of_line = unset
 indent_size = unset
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 28a0808..0000000
--- a/.eslintrc
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "globals": {
-    "$": false,
-    "_": false,
-    "fuzzy": false,
-    "jQuery": false,
-    "moment": false,
-    "odoo": false,
-    "openerp": false,
-    "self": false
-  },
-  "env": {
-    "browser": true
-  },
-  "rules": {
-    "no-alert": "warn",
-    "no-array-constructor": "warn",
-    "no-bitwise": "off",
-    "no-caller": "warn",
-    "no-case-declarations": "warn",
-    "no-catch-shadow": "warn",
-    "no-class-assign": "warn",
-    "no-cond-assign": "warn",
-    "no-confusing-arrow": "warn",
-    "no-console": "off",
-    "no-const-assign": "warn",
-    "no-constant-condition": "warn",
-    "no-continue": "off",
-    "no-control-regex": "warn",
-    "no-debugger": "warn",
-    "no-delete-var": "warn",
-    "no-div-regex": "warn",
-    "no-dupe-args": "warn",
-    "no-dupe-class-members": "warn",
-    "no-dupe-keys": "warn",
-    "no-duplicate-case": "warn",
-    "no-duplicate-imports": "warn",
-    "no-else-return": "warn",
-    "no-empty": "warn",
-    "no-empty-character-class": "warn",
-    "no-empty-function": "warn",
-    "no-empty-pattern": "warn",
-    "no-eq-null": "warn",
-    "no-eval": "warn",
-    "no-ex-assign": "warn",
-    "no-extend-native": "warn",
-    "no-extra-bind": "warn",
-    "no-extra-boolean-cast": "warn",
-    "no-extra-label": "warn",
-    "no-extra-parens": "warn",
-    "no-extra-semi": "warn",
-    "no-fallthrough": "warn",
-    "no-floating-decimal": "warn",
-    "no-func-assign": "warn",
-    "no-implicit-coercion": ["warn", {
-      "allow": ["~"]
-    }],
-    "no-implicit-globals": "warn",
-    "no-implied-eval": "warn",
-    "no-inline-comments": "warn",
-    "no-inner-declarations": "warn",
-    "no-invalid-regexp": "warn",
-    "no-invalid-this": "off",
-    "no-irregular-whitespace": "warn",
-    "no-iterator": "warn",
-    "no-label-var": "warn",
-    "no-labels": "warn",
-    "no-lone-blocks": "warn",
-    "no-lonely-if": "warn",
-    "no-loop-func": "off",
-    "no-magic-numbers": "off",
-    "no-mixed-operators": "warn",
-    "no-mixed-requires": "warn",
-    "no-mixed-spaces-and-tabs": "warn",
-    "no-multi-spaces": "warn",
-    "no-multi-str": "warn",
-    "no-multiple-empty-lines": "warn",
-    "no-native-reassign": "warn",
-    "no-negated-condition": "warn",
-    "no-negated-in-lhs": "warn",
-    "no-nested-ternary": "off",
-    "no-new": "warn",
-    "no-new-func": "warn",
-    "no-new-object": "warn",
-    "no-new-require": "warn",
-    "no-new-symbol": "warn",
-    "no-new-wrappers": "warn",
-    "no-obj-calls": "warn",
-    "no-octal": "warn",
-    "no-octal-escape": "warn",
-    "no-param-reassign": "warn",
-    "no-path-concat": "warn",
-    "no-plusplus": "off",
-    "no-process-env": "warn",
-    "no-process-exit": "warn",
-    "no-proto": "warn",
-    "no-prototype-builtins": "warn",
-    "no-redeclare": "warn",
-    "no-regex-spaces": "warn",
-    "no-restricted-globals": "warn",
-    "no-restricted-imports": "warn",
-    "no-restricted-modules": "warn",
-    "no-restricted-syntax": "warn",
-    "no-return-assign": "warn",
-    "no-script-url": "warn",
-    "no-self-assign": "warn",
-    "no-self-compare": "warn",
-    "no-sequences": "warn",
-    "no-shadow": "warn",
-    "no-shadow-restricted-names": "warn",
-    "no-whitespace-before-property": "warn",
-    "no-spaced-func": "warn",
-    "no-sparse-arrays": "warn",
-    "no-sync": "warn",
-    "no-tabs": "warn",
-    "no-ternary": "off",
-    "no-trailing-spaces": "warn",
-    "no-this-before-super": "warn",
-    "no-throw-literal": "warn",
-    "no-undef": "warn",
-    "no-undef-init": "warn",
-    "no-undefined": "off",
-    "no-unexpected-multiline": "warn",
-    "no-underscore-dangle": "off",
-    "no-unmodified-loop-condition": "warn",
-    "no-unneeded-ternary": "warn",
-    "no-unreachable": "warn",
-    "no-unsafe-finally": "warn",
-    "no-unused-expressions": "warn",
-    "no-unused-labels": "warn",
-    "no-unused-vars": "warn",
-    "no-use-before-define": "warn",
-    "no-useless-call": "warn",
-    "no-useless-computed-key": "warn",
-    "no-useless-concat": "warn",
-    "no-useless-constructor": "warn",
-    "no-useless-escape": "warn",
-    "no-useless-rename": "warn",
-    "no-void": "warn",
-    "no-var": "off",
-    "no-warning-comments": "off",
-    "no-with": "warn",
-    "array-bracket-spacing": "off",
-    "array-callback-return": "warn",
-    "arrow-body-style": "warn",
-    "arrow-parens": "warn",
-    "arrow-spacing": "off",
-    "accessor-pairs": "warn",
-    "block-scoped-var": "off",
-    "block-spacing": ["warn", "always"],
-    "brace-style": "warn",
-    "callback-return": "warn",
-    "camelcase": "off",
-    "capitalized-comments": ["warn", "always", {
-      "ignoreConsecutiveComments": true,
-      "ignoreInlineComments": true
-    }],
-    "comma-dangle": ["warn", "always-multiline"],
-    "comma-spacing": ["warn", {
-      "before": false,
-      "after": true
-    }],
-    "comma-style": "warn",
-    "complexity": [
-      "warn",
-      15
-    ],
-    "computed-property-spacing": "off",
-    "consistent-return": "off",
-    "consistent-this": "off",
-    "constructor-super": "warn",
-    "curly": "warn",
-    "default-case": "off",
-    "dot-location": ["warn", "property"],
-    "dot-notation": "warn",
-    "eol-last": "warn",
-    "eqeqeq": "warn",
-    "func-names": "off",
-    "func-style": "off",
-    "generator-star-spacing": "off",
-    "global-require": "warn",
-    "guard-for-in": "off",
-    "handle-callback-err": "warn",
-    "id-blacklist": "warn",
-    "id-length": "off",
-    "id-match": "warn",
-    "indent": "warn",
-    "init-declarations": "warn",
-    "jsx-quotes": "warn",
-    "key-spacing": "off",
-    "keyword-spacing": "warn",
-    "linebreak-style": [
-      "warn",
-      "unix"
-    ],
-    "lines-around-comment": "warn",
-    "max-depth": "warn",
-    "max-len": ["warn", {
-      "code": 88,
-      "ignorePattern": "odoo\\.define\\(",
-      "tabWidth": 4
-    }],
-    "max-lines": "off",
-    "max-nested-callbacks": "warn",
-    "max-params": "off",
-    "max-statements": "off",
-    "max-statements-per-line": "warn",
-    "multiline-ternary": "off",
-    "new-cap": "off",
-    "new-parens": "warn",
-    "newline-after-var": "off",
-    "newline-before-return": "off",
-    "newline-per-chained-call": "off",
-    "object-curly-newline": ["warn", { "consistent": true }],
-    "object-curly-spacing": ["warn", "never"],
-    "object-property-newline": ["warn", {
-      "allowAllPropertiesOnSameLine": true
-    }],
-    "object-shorthand": "off",
-    "one-var": "off",
-    "one-var-declaration-per-line": "off",
-    "operator-assignment": "warn",
-    "operator-linebreak": "warn",
-    "padded-blocks": "off",
-    "prefer-arrow-callback": "off",
-    "prefer-const": "warn",
-    "prefer-reflect": "off",
-    "prefer-rest-params": "off",
-    "prefer-spread": "off",
-    "prefer-template": "off",
-    "quote-props": "off",
-    "quotes": "off",
-    "radix": "warn",
-    "require-yield": "warn",
-    "rest-spread-spacing": "off",
-    "semi": [
-      "warn",
-      "always"
-    ],
-    "semi-spacing": "warn",
-    "sort-imports": "warn",
-    "sort-vars": "off",
-    "space-before-blocks": "warn",
-    "space-before-function-paren": "warn",
-    "space-in-parens": "off",
-    "space-infix-ops": "off",
-    "space-unary-ops": "off",
-    "spaced-comment": ["warn", "always"],
-    "strict": ["warn", "function"],
-    "template-curly-spacing": "off",
-    "unicode-bom": "warn",
-    "use-isnan": "warn",
-    "valid-jsdoc": ["warn", {
-      "prefer": {
-        "arg": "param",
-        "argument": "param",
-        "augments": "extends",
-        "constructor": "class",
-        "exception": "throws",
-        "func": "function",
-        "method": "function",
-        "prop": "property",
-        "return": "returns",
-        "virtual": "abstract",
-        "yield": "yields"
-      },
-      "preferType": {
-        "array": "Array",
-        "bool": "Boolean",
-        "boolean": "Boolean",
-        "number": "Number",
-        "object": "Object",
-        "str": "String",
-        "string": "String"
-      },
-      "requireParamDescription": false,
-      "requireReturn": false,
-      "requireReturnDescription": false,
-      "requireReturnType": false
-    }],
-    "valid-typeof": "warn",
-    "vars-on-top": "off",
-    "wrap-iife": "warn",
-    "wrap-regex": "warn",
-    "yield-star-spacing": "off",
-    "yoda": "warn"
-  },
-  "parserOptions": {
-      "ecmaVersion": 2017
-  }
-}
diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 0000000..88f2881
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1,180 @@
+env:
+  browser: true
+
+# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
+parserOptions:
+  ecmaVersion: 2017
+
+# Globals available in Odoo that shouldn't produce errorings
+globals:
+  _: readonly
+  $: readonly
+  fuzzy: readonly
+  jQuery: readonly
+  moment: readonly
+  odoo: readonly
+  openerp: readonly
+  Promise: readonly
+
+# Styling is handled by Prettier, so we only need to enable AST rules;
+# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
+rules:
+  accessor-pairs: warn
+  array-callback-return: warn
+  callback-return: warn
+  capitalized-comments:
+    - warn
+    - always
+    - ignoreConsecutiveComments: true
+      ignoreInlineComments: true
+  complexity:
+    - warn
+    - 15
+  constructor-super: warn
+  dot-notation: warn
+  eqeqeq: warn
+  global-require: warn
+  handle-callback-err: warn
+  id-blacklist: warn
+  id-match: warn
+  init-declarations: error
+  max-depth: warn
+  max-nested-callbacks: warn
+  max-statements-per-line: warn
+  no-alert: warn
+  no-array-constructor: warn
+  no-caller: warn
+  no-case-declarations: warn
+  no-class-assign: warn
+  no-cond-assign: error
+  no-const-assign: error
+  no-constant-condition: warn
+  no-control-regex: warn
+  no-debugger: error
+  no-delete-var: warn
+  no-div-regex: warn
+  no-dupe-args: error
+  no-dupe-class-members: error
+  no-dupe-keys: error
+  no-duplicate-case: error
+  no-duplicate-imports: error
+  no-else-return: warn
+  no-empty-character-class: warn
+  no-empty-function: error
+  no-empty-pattern: error
+  no-empty: warn
+  no-eq-null: error
+  no-eval: error
+  no-ex-assign: error
+  no-extend-native: warn
+  no-extra-bind: warn
+  no-extra-boolean-cast: warn
+  no-extra-label: warn
+  no-fallthrough: warn
+  no-func-assign: error
+  no-global-assign: error
+  no-implicit-coercion:
+    - warn
+    - allow: ["~"]
+  no-implicit-globals: warn
+  no-implied-eval: warn
+  no-inline-comments: warn
+  no-inner-declarations: warn
+  no-invalid-regexp: warn
+  no-irregular-whitespace: warn
+  no-iterator: warn
+  no-label-var: warn
+  no-labels: warn
+  no-lone-blocks: warn
+  no-lonely-if: error
+  no-mixed-requires: error
+  no-multi-str: warn
+  no-native-reassign: error
+  no-negated-condition: warn
+  no-negated-in-lhs: error
+  no-new-func: warn
+  no-new-object: warn
+  no-new-require: warn
+  no-new-symbol: warn
+  no-new-wrappers: warn
+  no-new: warn
+  no-obj-calls: warn
+  no-octal-escape: warn
+  no-octal: warn
+  no-param-reassign: warn
+  no-path-concat: warn
+  no-process-env: warn
+  no-process-exit: warn
+  no-proto: warn
+  no-prototype-builtins: warn
+  no-redeclare: warn
+  no-regex-spaces: warn
+  no-restricted-globals: warn
+  no-restricted-imports: warn
+  no-restricted-modules: warn
+  no-restricted-syntax: warn
+  no-return-assign: error
+  no-script-url: warn
+  no-self-assign: warn
+  no-self-compare: warn
+  no-sequences: warn
+  no-shadow-restricted-names: warn
+  no-shadow: warn
+  no-sparse-arrays: warn
+  no-sync: warn
+  no-this-before-super: warn
+  no-throw-literal: warn
+  no-undef-init: warn
+  no-undef: error
+  no-unmodified-loop-condition: warn
+  no-unneeded-ternary: error
+  no-unreachable: error
+  no-unsafe-finally: error
+  no-unused-expressions: error
+  no-unused-labels: error
+  no-unused-vars: error
+  no-use-before-define: error
+  no-useless-call: warn
+  no-useless-computed-key: warn
+  no-useless-concat: warn
+  no-useless-constructor: warn
+  no-useless-escape: warn
+  no-useless-rename: warn
+  no-void: warn
+  no-with: warn
+  operator-assignment: [error, always]
+  prefer-const: warn
+  radix: warn
+  require-yield: warn
+  sort-imports: warn
+  spaced-comment: [error, always]
+  strict: [error, function]
+  use-isnan: error
+  valid-jsdoc:
+    - warn
+    - prefer:
+        arg: param
+        argument: param
+        augments: extends
+        constructor: class
+        exception: throws
+        func: function
+        method: function
+        prop: property
+        return: returns
+        virtual: abstract
+        yield: yields
+      preferType:
+        array: Array
+        bool: Boolean
+        boolean: Boolean
+        number: Number
+        object: Object
+        str: String
+        string: String
+      requireParamDescription: false
+      requireReturn: false
+      requireReturnDescription: false
+      requireReturnType: false
+  valid-typeof: warn
+  yoda: warn
diff --git a/.isort.cfg b/.isort.cfg
index ce6837f..7683bad 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -9,4 +9,4 @@ line_length=88
 known_odoo=odoo
 known_odoo_addons=odoo.addons
 sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
-known_third_party=dateutil,lxml,setuptools
+default_section=THIRDPARTY
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 876d1e9..7501581 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,68 +1,99 @@
-exclude: "^setup/|/static/lib/|/static/src/lib/"
+exclude: |
+  (?x)
+  # Files and folders generated by bots, to avoid loops
+  ^setup/|/static/description/index\.html$|
+  # Maybe reactivate this when all README files include prettier ignore tags?
+  ^README\.md$|
+  # Library files can have extraneous formatting (even minimized)
+  /static/(src/)?lib/|
+  # Repos using Sphinx to generate docs don't need prettying
+  ^docs/_templates/.*\.html$|
+  # You don't usually want a bot to modify your legal texts
+  (LICENSE.*|COPYING.*)
 default_language_version:
   python: python3
 repos:
-- repo: https://github.com/psf/black
-  rev: 19.3b0
-  hooks:
-  - id: black
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
-  hooks:
-  - id: trailing-whitespace
-    # exclude autogenerated files
-    exclude: /README\.rst$|\.pot?$
-  - id: end-of-file-fixer
-    # exclude autogenerated files
-    exclude: /README\.rst$|\.pot?$
-  - id: debug-statements
-  - id: flake8
-    name: flake8 except __init__.py
-    exclude: /__init__\.py$
-    additional_dependencies: ["flake8-bugbear==19.8.0"]
-  - id: flake8
-    name: flake8 only __init__.py
-    args: ["--extend-ignore=F401"]  # ignore unused imports in __init__.py
-    files: /__init__\.py$
-    additional_dependencies: ["flake8-bugbear==19.8.0"]
-  - id: fix-encoding-pragma
-    args: ["--remove"]
-  - id: check-case-conflict
-  - id: check-docstring-first
-  - id: check-executables-have-shebangs
-  - id: check-merge-conflict
-  - id: check-symlinks
-  - id: check-xml
-  - id: mixed-line-ending
-    args: ["--fix=lf"]
-- repo: https://github.com/pre-commit/mirrors-pylint
-  rev: v2.3.1
-  hooks:
-  - id: pylint
-    name: pylint with optional checks
-    args: ["--rcfile=.pylintrc", "--exit-zero"]
-    verbose: true
-    additional_dependencies: ["pylint-odoo==3.0.3"]
-  - id: pylint
-    name: pylint with mandatory checks
-    args: ["--rcfile=.pylintrc-mandatory"]
-    additional_dependencies: ["pylint-odoo==3.0.3"]
-- repo: https://github.com/asottile/pyupgrade
-  rev: v1.24.0
-  hooks:
-  - id: pyupgrade
-- repo: https://github.com/asottile/seed-isort-config
-  rev: v1.9.3
-  hooks:
-  - id: seed-isort-config
-- repo: https://github.com/pre-commit/mirrors-isort
-  rev: v4.3.21
-  hooks:
-  - id: isort
-    name: isort except __init__.py
-    exclude: /__init__\.py$
-- repo: https://github.com/pre-commit/mirrors-eslint
-  rev: v6.5.1
-  hooks:
-  - id: eslint
-    verbose: true
+  - repo: https://github.com/psf/black
+    rev: 19.10b0
+    hooks:
+      - id: black
+  - repo: https://github.com/prettier/prettier
+    rev: "1.19.1"
+    hooks:
+      - id: prettier
+  # TODO Avoid awebdeveloper/pre-commit-prettier if possible
+  # HACK https://github.com/prettier/prettier/issues/7407
+  - repo: https://github.com/awebdeveloper/pre-commit-prettier
+    rev: v0.0.1
+    hooks:
+      - id: prettier
+        name: prettier xml plugin
+        additional_dependencies:
+          - "prettier@1.19.1"
+          - "@prettier/plugin-xml@0.7.2"
+        files: \.xml$
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: v6.8.0
+    hooks:
+      - id: eslint
+        verbose: true
+        args:
+          - --color
+          - --fix
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.4.0
+    hooks:
+      - id: trailing-whitespace
+        # exclude autogenerated files
+        exclude: /README\.rst$|\.pot?$
+      - id: end-of-file-fixer
+        # exclude autogenerated files
+        exclude: /README\.rst$|\.pot?$
+      - id: debug-statements
+      - id: flake8
+        name: flake8 except __init__.py
+        exclude: /__init__\.py$
+        additional_dependencies: ["flake8-bugbear==19.8.0"]
+      - id: flake8
+        name: flake8 only __init__.py
+        args: ["--extend-ignore=F401"] # ignore unused imports in __init__.py
+        files: /__init__\.py$
+        additional_dependencies: ["flake8-bugbear==19.8.0"]
+      - id: fix-encoding-pragma
+        args: ["--remove"]
+      - id: check-case-conflict
+      - id: check-docstring-first
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+        # exclude files where underlines are not distinguishable from merge conflicts
+        exclude: /README\.rst$|^docs/.*\.rst$
+      - id: check-symlinks
+      - id: check-xml
+      - id: mixed-line-ending
+        args: ["--fix=lf"]
+  - repo: https://github.com/pre-commit/mirrors-pylint
+    rev: v2.3.1
+    hooks:
+      - id: pylint
+        name: pylint with optional checks
+        args: ["--rcfile=.pylintrc", "--exit-zero"]
+        verbose: true
+        additional_dependencies: ["pylint-odoo==3.1.0"]
+      - id: pylint
+        name: pylint with mandatory checks
+        args: ["--rcfile=.pylintrc-mandatory"]
+        additional_dependencies: ["pylint-odoo==3.1.0"]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v1.26.2
+    hooks:
+      - id: pyupgrade
+  - repo: https://github.com/pre-commit/mirrors-isort
+    rev: v4.3.21
+    hooks:
+      - id: isort
+        name: isort except __init__.py
+        exclude: /__init__\.py$
+  - repo: https://github.com/acsone/setuptools-odoo
+    rev: 2.5.2
+    hooks:
+      - id: setuptools-odoo-make-default
diff --git a/.prettierrc.yml b/.prettierrc.yml
new file mode 100644
index 0000000..fc5f3a7
--- /dev/null
+++ b/.prettierrc.yml
@@ -0,0 +1,8 @@
+# Defaults for all prettier-supported languages.
+# Prettier will complete this with settings from .editorconfig file.
+bracketSpacing: false
+printWidth: 88
+proseWrap: always
+semi: true
+trailingComma: "es5"
+xmlWhitespaceSensitivity: "ignore"
diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory
index 26fe6ae..7635cbb 100644
--- a/.pylintrc-mandatory
+++ b/.pylintrc-mandatory
@@ -39,6 +39,7 @@ enable=anomalous-backslash-in-string,
     method-required-super,
     method-search,
     missing-import-error,
+    missing-manifest-dependency,
     openerp-exception-warning,
     pointless-statement,
     pointless-string-statement,
diff --git a/.travis.yml b/.travis.yml
index 8d16e8f..6716bfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: python
 cache:
   directories:
-  - $HOME/.cache/pip
-  - $HOME/.cache/pre-commit
+    - $HOME/.cache/pip
+    - $HOME/.cache/pre-commit
 
 python:
   - "3.6"
@@ -11,7 +11,7 @@ addons:
   postgresql: "9.6"
   apt:
     packages:
-      - expect-dev  # provides unbuffer utility
+      - expect-dev # provides unbuffer utility
 
 stages:
   - linting
@@ -34,10 +34,11 @@ jobs:
 
 env:
   global:
-  - VERSION="13.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0"
+    - VERSION="13.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0"
 
 install:
-  - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
+  - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git
+    ${HOME}/maintainer-quality-tools
   - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
   - travis_install_nightly
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 92d051b..8f7056a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,7 @@
 # OCA Guidelines
 
-Please follow the official guide from the [OCA Guidelines page](https://github.com/OCA/maintainer-tools/blob/master/CONTRIBUTING.md).
+Please follow the official guide from the
+[OCA Guidelines page](https://github.com/OCA/maintainer-tools/blob/master/CONTRIBUTING.md).
 
 ## Project Specific Guidelines
 
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>
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/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>
diff --git a/intrastat_product_generic/security/intrastat_security.xml b/intrastat_product_generic/security/intrastat_security.xml
index 5948c81..c49c266 100644
--- a/intrastat_product_generic/security/intrastat_security.xml
+++ b/intrastat_product_generic/security/intrastat_security.xml
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
-  <record id="group_intrastat_product_generic" model="res.groups">
-    <field name="name">Generic Intrastat Product Declaration</field>
-  </record>
-
-  <record id="base.user_admin" model="res.users">
-    <field eval="[(4, ref('group_intrastat_product_generic'))]" name="groups_id"/>
-  </record>
-
+    <record id="group_intrastat_product_generic" model="res.groups">
+        <field name="name">Generic Intrastat Product Declaration</field>
+    </record>
+    <record id="base.user_admin" model="res.users">
+        <field eval="[(4, ref('group_intrastat_product_generic'))]" name="groups_id" />
+    </record>
 </odoo>
diff --git a/intrastat_product_generic/views/intrastat_product.xml b/intrastat_product_generic/views/intrastat_product.xml
index 91d46f8..2ad68a3 100644
--- a/intrastat_product_generic/views/intrastat_product.xml
+++ b/intrastat_product_generic/views/intrastat_product.xml
@@ -1,16 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
-
-  <record id="intrastat_product_declaration_action_generic" model="ir.actions.act_window">
-    <field name="name">Generic Intrastat Product Declaration</field>
-    <field name="res_model">intrastat.product.declaration</field>
-    <field name="view_mode">tree,form,graph,pivot</field>
-    <field name="context">{'generic_intrastat_product_declaration': 1}</field>
-  </record>
-
-  <menuitem id="intrastat_product_declaration_menu_generic"
-            parent="intrastat_base.menu_intrastat_base_root"
-            action="intrastat_product_declaration_action_generic"
-            groups="group_intrastat_product_generic"/>
-
+    <record
+        id="intrastat_product_declaration_action_generic"
+        model="ir.actions.act_window"
+    >
+        <field name="name">Generic Intrastat Product Declaration</field>
+        <field name="res_model">intrastat.product.declaration</field>
+        <field name="view_mode">tree,form,graph,pivot</field>
+        <field name="context">{'generic_intrastat_product_declaration': 1}</field>
+    </record>
+    <menuitem
+        id="intrastat_product_declaration_menu_generic"
+        parent="intrastat_base.menu_intrastat_base_root"
+        action="intrastat_product_declaration_action_generic"
+        groups="group_intrastat_product_generic"
+    />
 </odoo>
diff --git a/product_harmonized_system/demo/product_demo.xml b/product_harmonized_system/demo/product_demo.xml
index 423f67d..83022b8 100644
--- a/product_harmonized_system/demo/product_demo.xml
+++ b/product_harmonized_system/demo/product_demo.xml
@@ -1,75 +1,60 @@
-<?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="84715000" model="hs.code">
-    <field name="local_code">84715000</field>
-    <field name="description">Automatic data-processing machines (computers)</field>
-</record>
-
-<record id="84717050" model="hs.code">
-    <field name="local_code">84717050</field>
-    <field name="description">Storage units</field>
-</record>
-
-<record id="85340090" model="hs.code">
-    <field name="local_code">85340090</field>
-    <field name="description">Printed circuits</field>
-</record>
-
-<record id="product.product_product_3" model="product.product">
-    <field name="hs_code_id" ref="84715000" />
-    <field name="origin_country_id" ref="base.tw" />
-    <field name="weight">8.7</field>
-</record>
-
-<record id="product.product_product_4" model="product.product">
-    <field name="hs_code_id" ref="84715000" />
-    <field name="origin_country_id" ref="base.cn" />
-    <field name="weight">1.1</field>
-</record>
-
-<record id="product.product_product_5" model="product.product">
-    <field name="hs_code_id" ref="84715000" />
-    <field name="origin_country_id" ref="base.cn" />
-    <field name="weight">8.2</field>
-</record>
-
-<record id="product.product_product_13" model="product.product">
-    <field name="hs_code_id" ref="84717050" />
-    <field name="origin_country_id" ref="base.sg" />
-    <field name="weight">0.01</field>
-</record>
-
-<record id="product.product_product_16" model="product.product">
-    <field name="hs_code_id" ref="84717050" />
-    <field name="origin_country_id" ref="base.sg" />
-    <field name="weight">0.67</field>
-</record>
-
-<record id="product.product_product_20" model="product.product">
-    <field name="hs_code_id" ref="85340090" />
-    <field name="origin_country_id" ref="base.tw" />
-    <field name="weight">1.05</field>
-</record>
-
-<record id="product.product_product_22" model="product.product">
-    <field name="hs_code_id" ref="85340090" />
-    <field name="origin_country_id" ref="base.tw" />
-    <field name="weight">0.3</field>
-</record>
-
-<record id="product.product_product_25" model="product.product">
-    <field name="hs_code_id" ref="84715000" />
-    <field name="origin_country_id" ref="base.be" />
-    <field name="weight">3.3</field>
-</record>
-
-
+    <record id="84715000" model="hs.code">
+        <field name="local_code">84715000</field>
+        <field name="description">Automatic data-processing machines (computers)</field>
+    </record>
+    <record id="84717050" model="hs.code">
+        <field name="local_code">84717050</field>
+        <field name="description">Storage units</field>
+    </record>
+    <record id="85340090" model="hs.code">
+        <field name="local_code">85340090</field>
+        <field name="description">Printed circuits</field>
+    </record>
+    <record id="product.product_product_3" model="product.product">
+        <field name="hs_code_id" ref="84715000" />
+        <field name="origin_country_id" ref="base.tw" />
+        <field name="weight">8.7</field>
+    </record>
+    <record id="product.product_product_4" model="product.product">
+        <field name="hs_code_id" ref="84715000" />
+        <field name="origin_country_id" ref="base.cn" />
+        <field name="weight">1.1</field>
+    </record>
+    <record id="product.product_product_5" model="product.product">
+        <field name="hs_code_id" ref="84715000" />
+        <field name="origin_country_id" ref="base.cn" />
+        <field name="weight">8.2</field>
+    </record>
+    <record id="product.product_product_13" model="product.product">
+        <field name="hs_code_id" ref="84717050" />
+        <field name="origin_country_id" ref="base.sg" />
+        <field name="weight">0.01</field>
+    </record>
+    <record id="product.product_product_16" model="product.product">
+        <field name="hs_code_id" ref="84717050" />
+        <field name="origin_country_id" ref="base.sg" />
+        <field name="weight">0.67</field>
+    </record>
+    <record id="product.product_product_20" model="product.product">
+        <field name="hs_code_id" ref="85340090" />
+        <field name="origin_country_id" ref="base.tw" />
+        <field name="weight">1.05</field>
+    </record>
+    <record id="product.product_product_22" model="product.product">
+        <field name="hs_code_id" ref="85340090" />
+        <field name="origin_country_id" ref="base.tw" />
+        <field name="weight">0.3</field>
+    </record>
+    <record id="product.product_product_25" model="product.product">
+        <field name="hs_code_id" ref="84715000" />
+        <field name="origin_country_id" ref="base.be" />
+        <field name="weight">3.3</field>
+    </record>
 </odoo>
diff --git a/product_harmonized_system/security/product_hs_security.xml b/product_harmonized_system/security/product_hs_security.xml
index c7da6fb..fc1a5e0 100644
--- a/product_harmonized_system/security/product_hs_security.xml
+++ b/product_harmonized_system/security/product_hs_security.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="hs_code_company_rule" model="ir.rule">
-      <field name="name">HS Code Company rule</field>
-      <field name="model_id" ref="model_hs_code"/>
-      <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+        <field name="name">HS Code Company rule</field>
+        <field name="model_id" ref="model_hs_code" />
+        <field
+            name="domain_force"
+        >['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
     </record>
-
 </odoo>
diff --git a/product_harmonized_system/views/hs_code.xml b/product_harmonized_system/views/hs_code.xml
index 93a5e46..1841ced 100644
--- a/product_harmonized_system/views/hs_code.xml
+++ b/product_harmonized_system/views/hs_code.xml
@@ -1,39 +1,41 @@
-<?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>
-
     <!-- Search view for H.S. code -->
     <record id="hs_code_view_search" model="ir.ui.view">
-      <field name="name">hs.code.search</field>
-      <field name="model">hs.code</field>
-      <field name="arch" type="xml">
-        <search string="Search H.S. Codes">
-          <field name="local_code"
-                filter_domain="['|', ('local_code', 'like', self), ('description', 'ilike', self)]"/>
-          <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-        </search>
-      </field>
+        <field name="name">hs.code.search</field>
+        <field name="model">hs.code</field>
+        <field name="arch" type="xml">
+            <search string="Search H.S. Codes">
+                <field
+                    name="local_code"
+                    filter_domain="['|', ('local_code', 'like', self), ('description', 'ilike', self)]"
+                />
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active', '=', False)]"
+                />
+            </search>
+        </field>
     </record>
-
     <!-- Tree view for H.S. code -->
     <record id="hs_code_view_tree" model="ir.ui.view">
-      <field name="name">hs.code.tree</field>
-      <field name="model">hs.code</field>
-      <field name="arch" type="xml">
-        <tree string="H.S. Codes">
-          <field name="hs_code"/>
-          <field name="local_code"/>
-          <field name="description"/>
-          <field name="company_id" groups="base.group_multi_company"/>
-        </tree>
-      </field>
+        <field name="name">hs.code.tree</field>
+        <field name="model">hs.code</field>
+        <field name="arch" type="xml">
+            <tree string="H.S. Codes">
+                <field name="hs_code" />
+                <field name="local_code" />
+                <field name="description" />
+                <field name="company_id" groups="base.group_multi_company" />
+            </tree>
+        </field>
     </record>
-
     <!-- Action used in the form view for HS codes -->
     <record id="product_categ_hs_code_action" model="ir.actions.act_window">
         <field name="name">Product Categories</field>
@@ -41,63 +43,73 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('hs_code_id', '=', active_id)]</field>
     </record>
-
     <record id="product_template_hs_code_action" model="ir.actions.act_window">
         <field name="name">Products</field>
         <field name="res_model">product.template</field>
         <field name="view_mode">kanban,tree,form</field>
         <field name="domain">[('hs_code_id', '=', active_id)]</field>
     </record>
-
     <!-- Form view for H.S. code -->
     <record id="hs_code_view_form" model="ir.ui.view">
-      <field name="name">hs.code.form</field>
-      <field name="model">hs.code</field>
-      <field name="arch" type="xml">
-        <form string="H.S. Code">
-          <div class="oe_button_box" name="button_box">
-            <button class="oe_stat_button"
-                name="%(product_categ_hs_code_action)d"
-                icon="fa-th-list"
-                type="action">
-              <div class="o_field_widget o_stat_info">
-                <span class="o_stat_value"><field name="product_categ_count"/></span>
-                <span class="o_stat_text"> Product Categs</span>
-              </div>
-            </button>
-            <button class="oe_stat_button"
-                name="%(product_template_hs_code_action)d"
-                icon="fa-th-list"
-                type="action">
-              <div class="o_field_widget o_stat_info">
-                <span class="o_stat_value"><field name="product_tmpl_count"/></span>
-                <span class="o_stat_text"> Products</span>
-              </div>
-            </button>
-            <button name="toggle_active" type="object"
-                    class="oe_stat_button" icon="fa-archive">
-                <field name="active" widget="boolean_button"
-                        options='{"terminology": "archive"}'/>
-            </button>
-          </div>
-          <group name="main">
-            <field name="local_code" />
-            <field name="hs_code"/>
-            <field name="description"/>
-            <field name="company_id" groups="base.group_multi_company"/>
-          </group>
-        </form>
-      </field>
+        <field name="name">hs.code.form</field>
+        <field name="model">hs.code</field>
+        <field name="arch" type="xml">
+            <form string="H.S. Code">
+                <div class="oe_button_box" name="button_box">
+                    <button
+                        class="oe_stat_button"
+                        name="%(product_categ_hs_code_action)d"
+                        icon="fa-th-list"
+                        type="action"
+                    >
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value">
+                                <field name="product_categ_count" />
+                            </span>
+                            <span class="o_stat_text"> Product Categs</span>
+                        </div>
+                    </button>
+                    <button
+                        class="oe_stat_button"
+                        name="%(product_template_hs_code_action)d"
+                        icon="fa-th-list"
+                        type="action"
+                    >
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value">
+                                <field name="product_tmpl_count" />
+                            </span>
+                            <span class="o_stat_text"> Products</span>
+                        </div>
+                    </button>
+                    <button
+                        name="toggle_active"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-archive"
+                    >
+                        <field
+                            name="active"
+                            widget="boolean_button"
+                            options='{"terminology": "archive"}'
+                        />
+                    </button>
+                </div>
+                <group name="main">
+                    <field name="local_code" />
+                    <field name="hs_code" />
+                    <field name="description" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                </group>
+            </form>
+        </field>
     </record>
-
     <!-- Action for H.S. code -->
     <record id="hs_code_action" model="ir.actions.act_window">
-      <field name="name">H.S. Codes</field>
-      <field name="res_model">hs.code</field>
-      <field name="view_mode">tree,form</field>
+        <field name="name">H.S. Codes</field>
+        <field name="res_model">hs.code</field>
+        <field name="view_mode">tree,form</field>
     </record>
-
     <!-- The menu entry for H.S. code is now provided by the module
          product_harmonized_system_stock -->
-
 </odoo>
diff --git a/product_harmonized_system/views/product_category.xml b/product_harmonized_system/views/product_category.xml
index 419f2e0..eb58029 100644
--- a/product_harmonized_system/views/product_category.xml
+++ b/product_harmonized_system/views/product_category.xml
@@ -1,24 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2010-2019 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>
-
     <!-- Product category form view -->
     <record id="product_category_form_view" model="ir.ui.view">
-      <field name="name">hs_code.product.category.form</field>
-      <field name="model">product.category</field>
-      <field name="inherit_id" ref="product.product_category_form_view"/>
-      <field name="arch" type="xml">
-        <xpath expr="//group[@name='first']" position="after">
-          <group name="hs_code" string="Import/Export Properties" colspan="2">
-            <field name="hs_code_id"/>
-          </group>
-        </xpath>
-      </field>
+        <field name="name">hs_code.product.category.form</field>
+        <field name="model">product.category</field>
+        <field name="inherit_id" ref="product.product_category_form_view" />
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='first']" position="after">
+                <group name="hs_code" string="Import/Export Properties" colspan="2">
+                    <field name="hs_code_id" />
+                </group>
+            </xpath>
+        </field>
     </record>
-
 </odoo>
diff --git a/product_harmonized_system/views/product_template.xml b/product_harmonized_system/views/product_template.xml
index b382e8c..1907d8d 100644
--- a/product_harmonized_system/views/product_template.xml
+++ b/product_harmonized_system/views/product_template.xml
@@ -1,23 +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>
-
     <!-- product.template form view -->
     <record id="product_template_form_view" model="ir.ui.view">
-      <field name="name">hs_code.product.template.form</field>
-      <field name="model">product.template</field>
-      <field name="inherit_id" ref="product.product_template_form_view" />
-      <field name="arch" type="xml">
-        <field name="company_id" position="before">
-          <field name="hs_code_id" attrs="{'invisible': [('type', '=', 'service')]}"/>
-          <field name="origin_country_id" attrs="{'invisible': [('type', '=', 'service')]}"/>
+        <field name="name">hs_code.product.template.form</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_form_view" />
+        <field name="arch" type="xml">
+            <field name="company_id" position="before">
+                <field
+                    name="hs_code_id"
+                    attrs="{'invisible': [('type', '=', 'service')]}"
+                />
+                <field
+                    name="origin_country_id"
+                    attrs="{'invisible': [('type', '=', 'service')]}"
+                />
+            </field>
         </field>
-      </field>
     </record>
-
 </odoo>
diff --git a/product_harmonized_system_delivery/views/product_template.xml b/product_harmonized_system_delivery/views/product_template.xml
index d9a6695..d257701 100644
--- a/product_harmonized_system_delivery/views/product_template.xml
+++ b/product_harmonized_system_delivery/views/product_template.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2018 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>
-
     <!-- product.template form view -->
     <record id="product_template_hs_code" model="ir.ui.view">
-      <field name="name">hide_native_hs_code_field.product.template.form</field>
-      <field name="model">product.template</field>
-      <field name="inherit_id" ref="delivery.product_template_hs_code" />
-      <field name="arch" type="xml">
-        <field name="hs_code" position="attributes">
-            <attribute name="invisible">1</attribute>
+        <field name="name">hide_native_hs_code_field.product.template.form</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="delivery.product_template_hs_code" />
+        <field name="arch" type="xml">
+            <field name="hs_code" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </field>
         </field>
-      </field>
     </record>
-
 </odoo>
diff --git a/product_harmonized_system_stock/views/hs_code_menu.xml b/product_harmonized_system_stock/views/hs_code_menu.xml
index 483b170..464f3f7 100644
--- a/product_harmonized_system_stock/views/hs_code_menu.xml
+++ b/product_harmonized_system_stock/views/hs_code_menu.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2019 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>
-
     <!-- Menu entry for H.S. code -->
-    <menuitem id="hs_code_menu" action="product_harmonized_system.hs_code_action"
-        parent="stock.menu_product_in_config_stock" sequence="60"/>
-
+    <menuitem
+        id="hs_code_menu"
+        action="product_harmonized_system.hs_code_action"
+        parent="stock.menu_product_in_config_stock"
+        sequence="60"
+    />
 </odoo>