diff --git a/.editorconfig b/.editorconfig
index 62276b0d5..bfd7ac53d 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 28a0808b3..000000000
--- 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 000000000..88f2881b4
--- /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 98b216f74..7683badfa 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=setuptools
+default_section=THIRDPARTY
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 876d1e98e..750158169 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 000000000..fc5f3a7c4
--- /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/.travis.yml b/.travis.yml
index 8d16e8fcd..6716bfade 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/account_move_line_product/views/account_move_line_view.xml b/account_move_line_product/views/account_move_line_view.xml
index 73efc2968..3f2f32c79 100644
--- a/account_move_line_product/views/account_move_line_view.xml
+++ b/account_move_line_product/views/account_move_line_view.xml
@@ -1,47 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2019 ForgeFlow S.L. (https://www.forgeflow.com)
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
     <record id="view_move_line_tree" model="ir.ui.view">
         <field name="name">account.move.line.tree</field>
         <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <field name="inherit_id" ref="account.view_move_line_tree" />
         <field name="arch" type="xml">
             <field name="partner_id" position="after">
-                <field name="product_id"/>
-                <field name="quantity"/>
+                <field name="product_id" />
+                <field name="quantity" />
             </field>
         </field>
     </record>
-
     <record id="view_account_move_line_filter" model="ir.ui.view">
         <field name="name">Journal Items</field>
         <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+        <field name="inherit_id" ref="account.view_account_move_line_filter" />
         <field name="arch" type="xml">
             <field name="partner_id" position="after">
-                <field name="product_id"/>
+                <field name="product_id" />
             </field>
             <group position="inside">
-                    <filter name="group_product_id" string="Product"
-                            domain="[]"
-                            context="{'group_by':'product_id'}"/>
+                <filter
+                    name="group_product_id"
+                    string="Product"
+                    domain="[]"
+                    context="{'group_by':'product_id'}"
+                />
             </group>
         </field>
     </record>
-
     <record id="view_move_form" model="ir.ui.view">
         <field name="name">account.move.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="//field[@name='line_ids']/tree//field[@name='partner_id']" position="after">
-                <field name="product_id"/>
-                <field name="quantity"/>
+            <xpath
+                expr="//field[@name='line_ids']/tree//field[@name='partner_id']"
+                position="after"
+            >
+                <field name="product_id" />
+                <field name="quantity" />
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/account_move_line_stock_info/views/account_move_line_view.xml b/account_move_line_stock_info/views/account_move_line_view.xml
index 636f5516a..6e9aff197 100644
--- a/account_move_line_stock_info/views/account_move_line_view.xml
+++ b/account_move_line_stock_info/views/account_move_line_view.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_move_line_form" model="ir.ui.view">
         <field name="name">account.move.line.form</field>
         <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_move_line_form"/>
+        <field name="inherit_id" ref="account.view_move_line_form" />
         <field name="arch" type="xml">
             <field name="quantity" position="before">
-                <field name="stock_move_id"/>
+                <field name="stock_move_id" />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/account_move_line_stock_info/views/stock_move_view.xml b/account_move_line_stock_info/views/stock_move_view.xml
index 26b6b3d0d..8cad7c929 100644
--- a/account_move_line_stock_info/views/stock_move_view.xml
+++ b/account_move_line_stock_info/views/stock_move_view.xml
@@ -1,35 +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">stock.move.form</field>
         <field name="model">stock.move</field>
-        <field name="inherit_id" ref="stock.view_move_form"/>
+        <field name="inherit_id" ref="stock.view_move_form" />
         <field name="arch" type="xml">
             <group name="linked_group" position="after">
-                <group name="account_move_lines_grp"
-                       string="Journal Items" colspan="4">
-                    <field name="account_move_line_ids" readonly="1"
-                           nolabel="1"/>
+                <group name="account_move_lines_grp" string="Journal Items" colspan="4">
+                    <field name="account_move_line_ids" readonly="1" nolabel="1" />
                 </group>
             </group>
         </field>
     </record>
-
-
     <record id="view_picking_form" model="ir.ui.view">
         <field name="name">stock.picking.form</field>
         <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="inherit_id" ref="stock.view_picking_form" />
         <field name="arch" type="xml">
-            <xpath expr="//notebook//form//field[@name='description_picking']" position="after">
-                <group name="account_move_lines_grp"
-                       string="Journal Items" colspan="4">
-                    <field name="account_move_line_ids" readonly="1"
-                           nolabel="1"/>
+            <xpath
+                expr="//notebook//form//field[@name='description_picking']"
+                position="after"
+            >
+                <group name="account_move_lines_grp" string="Journal Items" colspan="4">
+                    <field name="account_move_line_ids" readonly="1" nolabel="1" />
                 </group>
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/scrap_reason_code/views/reason_code_view.xml b/scrap_reason_code/views/reason_code_view.xml
index 3c457a87c..272dc09a9 100644
--- a/scrap_reason_code/views/reason_code_view.xml
+++ b/scrap_reason_code/views/reason_code_view.xml
@@ -1,48 +1,45 @@
 <!-- Copyright 2019 Open Source Integrators
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
-   <!-- Reason Code Type -->
-   <record id="view_reason_code_form" model="ir.ui.view">
+    <!-- Reason Code Type -->
+    <record id="view_reason_code_form" model="ir.ui.view">
         <field name="name">reason.code.form</field>
         <field name="model">reason.code</field>
         <field name="arch" type="xml">
             <form string="Reason Code">
                 <group>
-                    <field name="name"/>
+                    <field name="name" />
                 </group>
                 <group>
-                    <field name="description"/>
+                    <field name="description" />
                 </group>
                 <group>
-                    <field name="location_id"/>
+                    <field name="location_id" />
                 </group>
             </form>
         </field>
     </record>
-
     <record id="view_reason_code_list" model="ir.ui.view">
         <field name="name">reason.code.list</field>
         <field name="model">reason.code</field>
         <field name="arch" type="xml">
             <tree string="Reason Codes">
-                <field name="name"/>
-                <field name="description"/>
-                <field name="location_id"/>
+                <field name="name" />
+                <field name="description" />
+                <field name="location_id" />
             </tree>
         </field>
     </record>
-
     <record id="open_view_reason_code_form" model="ir.actions.act_window">
         <field name="name">Scrap Reason Codes</field>
         <field name="res_model">reason.code</field>
         <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem action="open_view_reason_code_form"
-              id="menu_view_reason_code_form"
-              parent="stock.menu_stock_config_settings"
-              sequence="55"
-              groups="stock.group_stock_manager"/>
+    <menuitem
+        action="open_view_reason_code_form"
+        id="menu_view_reason_code_form"
+        parent="stock.menu_stock_config_settings"
+        sequence="55"
+        groups="stock.group_stock_manager"
+    />
 </odoo>
diff --git a/scrap_reason_code/views/stock_move_views.xml b/scrap_reason_code/views/stock_move_views.xml
index fd7e18e75..a2a77af18 100644
--- a/scrap_reason_code/views/stock_move_views.xml
+++ b/scrap_reason_code/views/stock_move_views.xml
@@ -1,18 +1,20 @@
 <!-- Copyright 2019 Open Source Integrators
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-   <record id="stock_reason_code_form" model="ir.ui.view">
+    <record id="stock_reason_code_form" model="ir.ui.view">
         <field name="name">stock.reason.code.form</field>
         <field name="model">stock.move</field>
-        <field name="inherit_id" ref="stock.view_move_form"/>
+        <field name="inherit_id" ref="stock.view_move_form" />
         <field name="arch" type="xml">
             <xpath expr="//group[@name='origin_grp']" position='after'>
-                <field name="scrapped" invisible="1"/>
-                <group string="Reason Code" attrs="{'invisible': [('scrapped', '!=', True)]}">
-                    <field name="reason_code_id"/>
+                <field name="scrapped" invisible="1" />
+                <group
+                    string="Reason Code"
+                    attrs="{'invisible': [('scrapped', '!=', True)]}"
+                >
+                    <field name="reason_code_id" />
                 </group>
             </xpath>
         </field>
-   </record>
+    </record>
 </odoo>
diff --git a/scrap_reason_code/views/stock_scrap_views.xml b/scrap_reason_code/views/stock_scrap_views.xml
index 8a0706087..4b60ee1f3 100644
--- a/scrap_reason_code/views/stock_scrap_views.xml
+++ b/scrap_reason_code/views/stock_scrap_views.xml
@@ -1,37 +1,33 @@
 <!-- Copyright 2019 Open Source Integrators
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
     <record id="stock_scrap_form_reason_code" model="ir.ui.view">
         <field name="name">stock.scrap.form.reason.code</field>
         <field name="model">stock.scrap</field>
-        <field name="inherit_id" ref="stock.stock_scrap_form_view"/>
+        <field name="inherit_id" ref="stock.stock_scrap_form_view" />
         <field name="arch" type="xml">
             <xpath expr="//group/group" position='inside'>
-                <field name="reason_code_id"/>
+                <field name="reason_code_id" />
             </xpath>
         </field>
     </record>
-
     <record id="stock_scrap_tree_reason_code" model="ir.ui.view">
         <field name="name">stock.scrap.tree.reason.code</field>
         <field name="model">stock.scrap</field>
-        <field name="inherit_id" ref="stock.stock_scrap_tree_view"/>
+        <field name="inherit_id" ref="stock.stock_scrap_tree_view" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='product_uom_id']" position='after'>
-                <field name="reason_code_id"/>
+                <field name="reason_code_id" />
             </xpath>
         </field>
     </record>
-
     <record id="stock_scrap_form2_reason_code" model="ir.ui.view">
         <field name="name">stock.scrap.form2.reason.code</field>
         <field name="model">stock.scrap</field>
-        <field name="inherit_id" ref="stock.stock_scrap_form_view2"/>
+        <field name="inherit_id" ref="stock.stock_scrap_form_view2" />
         <field name="arch" type="xml">
             <xpath expr="//group/group" position='inside'>
-                <field name="reason_code_id"/>
+                <field name="reason_code_id" />
             </xpath>
         </field>
     </record>
diff --git a/stock_account_change_qty_reason/views/stock_inventory_line_reason_view.xml b/stock_account_change_qty_reason/views/stock_inventory_line_reason_view.xml
index aa838993a..e0a1331dc 100644
--- a/stock_account_change_qty_reason/views/stock_inventory_line_reason_view.xml
+++ b/stock_account_change_qty_reason/views/stock_inventory_line_reason_view.xml
@@ -1,15 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2019 ForgeFlow S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="view_account_preset_reason" model="ir.ui.view">
         <field name="name">Preset Reason Accounts</field>
         <field name="model">stock.inventory.line.reason</field>
-        <field name="inherit_id" ref="stock_change_qty_reason.view_preset_reason"/>
+        <field name="inherit_id" ref="stock_change_qty_reason.view_preset_reason" />
         <field name="arch" type="xml">
             <field name="description" position="after">
-                <field name="account_reason_input_id" groups="account.group_account_user"/>
-                <field name="account_reason_output_id" groups="account.group_account_user"/>
+                <field
+                    name="account_reason_input_id"
+                    groups="account.group_account_user"
+                />
+                <field
+                    name="account_reason_output_id"
+                    groups="account.group_account_user"
+                />
             </field>
         </field>
     </record>
diff --git a/stock_account_change_qty_reason/views/stock_move_view.xml b/stock_account_change_qty_reason/views/stock_move_view.xml
index 022107ae8..89542dd41 100644
--- a/stock_account_change_qty_reason/views/stock_move_view.xml
+++ b/stock_account_change_qty_reason/views/stock_move_view.xml
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2019 ForgeFlow S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="view_move_form" model="ir.ui.view">
         <field name="name">stock.move.form</field>
         <field name="model">stock.move</field>
-        <field name="inherit_id" ref="stock.view_move_form"/>
+        <field name="inherit_id" ref="stock.view_move_form" />
         <field name="arch" type="xml">
             <field name="origin" position="after">
-                <field name="preset_reason_id"
-                       invisible="[('preset_reason_id','=',False)]"/>
+                <field
+                    name="preset_reason_id"
+                    invisible="[('preset_reason_id','=',False)]"
+                />
             </field>
         </field>
     </record>
diff --git a/stock_available_unreserved/views/product_view.xml b/stock_available_unreserved/views/product_view.xml
index f8c1c4185..6e5900923 100644
--- a/stock_available_unreserved/views/product_view.xml
+++ b/stock_available_unreserved/views/product_view.xml
@@ -1,86 +1,96 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_stock_product_template_tree" model="ir.ui.view">
         <field name="name">product.template.stock.tree.inherit</field>
         <field name="model">product.template</field>
-        <field name="inherit_id"
-               ref="stock.view_stock_product_template_tree"/>
+        <field name="inherit_id" ref="stock.view_stock_product_template_tree" />
         <field name="arch" type="xml">
             <field name="qty_available" position="after">
-                <field name="qty_available_not_res"/>
+                <field name="qty_available_not_res" />
             </field>
         </field>
     </record>
-
     <record id="product_template_search_form_view_stock" model="ir.ui.view">
         <field name="name">product.template.search.stock.form.inherit</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="stock.product_template_search_form_view_stock"/>
+        <field name="inherit_id" ref="stock.product_template_search_form_view_stock" />
         <field name="arch" type="xml">
             <filter name="real_stock_available" position="after">
-                <filter name="real_stock_unreserved" string="Reservable Products" domain="[('qty_available_not_res','&gt;',0)]"/>
+                <filter
+                    name="real_stock_unreserved"
+                    string="Reservable Products"
+                    domain="[('qty_available_not_res','&gt;',0)]"
+                />
             </filter>
         </field>
     </record>
-
     <record id="product_template_kanban_stock_view" model="ir.ui.view">
         <field name="name">Product Template Kanban Stock</field>
         <field name="model">product.template</field>
-        <field name="inherit_id"
-               ref="stock.product_template_kanban_stock_view"/>
+        <field name="inherit_id" ref="stock.product_template_kanban_stock_view" />
         <field name="arch" type="xml">
             <ul position="inside">
-                <li t-if="record.type.raw_value == 'product'">Unreserved: <field name="qty_available_not_res"/> <field name="uom_id"/></li>
+                <li t-if="record.type.raw_value == 'product'">Unreserved: <field
+                        name="qty_available_not_res"
+                    /> <field name="uom_id" /></li>
             </ul>
         </field>
     </record>
-
     <record id="view_stock_product_tree" model="ir.ui.view">
         <field name="name">product.stock.tree.inherit</field>
         <field name="model">product.product</field>
-        <field name="inherit_id" ref="stock.view_stock_product_tree"/>
+        <field name="inherit_id" ref="stock.view_stock_product_tree" />
         <field name="arch" type="xml">
             <field name="qty_available" position="after">
-                <field name="qty_available_not_res"/>
+                <field name="qty_available_not_res" />
             </field>
         </field>
     </record>
-
     <record id="product_template_form_view_procurement_button" model="ir.ui.view">
         <field name="name">product.template_procurement</field>
         <field name="model">product.template</field>
-        <field name="inherit_id"
-               ref="stock.product_template_form_view_procurement_button"/>
+        <field
+            name="inherit_id"
+            ref="stock.product_template_form_view_procurement_button"
+        />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button type="object"
+                <button
+                    type="object"
                     name="action_open_quants_unreserved"
                     attrs="{'invisible':[('type', '!=', 'product')]}"
-                    class="oe_stat_button" icon="fa-building-o">
-                    <field name="qty_available_not_res" widget="statinfo"
-                           string="Unreserved"/>
+                    class="oe_stat_button"
+                    icon="fa-building-o"
+                >
+                    <field
+                        name="qty_available_not_res"
+                        widget="statinfo"
+                        string="Unreserved"
+                    />
                 </button>
             </div>
         </field>
     </record>
-
     <record id="product_form_view_procurement_button" model="ir.ui.view">
         <field name="name">product.product.procurement</field>
         <field name="model">product.product</field>
-        <field name="inherit_id"
-               ref="stock.product_form_view_procurement_button"/>
+        <field name="inherit_id" ref="stock.product_form_view_procurement_button" />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button class="oe_stat_button"
-                        name="%(product_open_quants_unreserved)d"
-                        icon="fa-building-o"
-                        type="action" attrs="{'invisible':[('type', '!=', 'product')]}">
-                    <field name="qty_available_not_res" widget="statinfo"
-                           string="Unreserved"/>
+                <button
+                    class="oe_stat_button"
+                    name="%(product_open_quants_unreserved)d"
+                    icon="fa-building-o"
+                    type="action"
+                    attrs="{'invisible':[('type', '!=', 'product')]}"
+                >
+                    <field
+                        name="qty_available_not_res"
+                        widget="statinfo"
+                        string="Unreserved"
+                    />
                 </button>
             </div>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_available_unreserved/views/stock_quant_view.xml b/stock_available_unreserved/views/stock_quant_view.xml
index d8a3bdffa..78b532be1 100644
--- a/stock_available_unreserved/views/stock_quant_view.xml
+++ b/stock_available_unreserved/views/stock_quant_view.xml
@@ -1,28 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="quant_search_view" model="ir.ui.view">
         <field name="name">stock.quant.search</field>
         <field name="model">stock.quant</field>
-        <field name="inherit_id" ref="stock.quant_search_view"/>
-        <field eval="10" name="priority"/>
+        <field name="inherit_id" ref="stock.quant_search_view" />
+        <field eval="10" name="priority" />
         <field name="arch" type="xml">
             <field name="owner_id" position="after">
-                <field name="contains_unreserved"/>
+                <field name="contains_unreserved" />
             </field>
             <filter name="internal_loc" position="after">
-                <filter name='internal_unreserved'
-                        string="Internal Unreserved"
-                        domain="[('contains_unreserved','=', True), ('location_id.usage','=', 'internal')]"/>
+                <filter
+                    name='internal_unreserved'
+                    string="Internal Unreserved"
+                    domain="[('contains_unreserved','=', True), ('location_id.usage','=', 'internal')]"
+                />
             </filter>
         </field>
     </record>
-
     <record id="product_open_quants_unreserved" model="ir.actions.act_window">
         <field name="name">Stock On Hand (Unreserved)</field>
-        <field name="context">{'search_default_internal_loc': 1, 'search_default_locationgroup':1}</field>
-        <field name="domain">[('product_id', '=', active_id), ('contains_unreserved', '=', True)]</field>
+        <field
+            name="context"
+        >{'search_default_internal_loc': 1, 'search_default_locationgroup':1}</field>
+        <field
+            name="domain"
+        >[('product_id', '=', active_id), ('contains_unreserved', '=', True)]</field>
         <field name="res_model">stock.quant</field>
     </record>
-
 </odoo>
diff --git a/stock_change_qty_reason/security/stock_security.xml b/stock_change_qty_reason/security/stock_security.xml
index 80fac1de4..4bf0cc42a 100644
--- a/stock_change_qty_reason/security/stock_security.xml
+++ b/stock_change_qty_reason/security/stock_security.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="group_qty_reason_preset" model="res.groups">
         <field name="name">Manage Stock Change Qty Preset Reasons</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
+        <field name="category_id" ref="base.module_category_hidden" />
     </record>
 </odoo>
diff --git a/stock_change_qty_reason/views/base_config_view.xml b/stock_change_qty_reason/views/base_config_view.xml
index 9c6d70cbe..8b388e3ba 100644
--- a/stock_change_qty_reason/views/base_config_view.xml
+++ b/stock_change_qty_reason/views/base_config_view.xml
@@ -1,23 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2019 ForgeFlow S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record id="qty_reason_preset_selection" model="ir.ui.view">
         <field name="name">Select qty_reason_preset config parameter</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id"
-               ref="stock.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="stock.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@id='production_lot_info']" position='after'>
                 <h2>Inventory Adjustment</h2>
                 <div class="row mt16 o_settings_container">
                     <div class="col-xs-12 col-md-6 o_setting_box">
                         <div class="o_setting_left_pane">
-                            <field name="group_qty_reason_preset"/>
+                            <field name="group_qty_reason_preset" />
                         </div>
                         <div class="o_setting_right_pane">
-                            <label for="group_qty_reason_preset"/>
+                            <label for="group_qty_reason_preset" />
                             <div class="text-muted">
                                 Manage predefined change quantity reasons
                             </div>
@@ -27,5 +25,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_change_qty_reason/views/stock_inventory_line_reason_view.xml b/stock_change_qty_reason/views/stock_inventory_line_reason_view.xml
index 4b619b598..5922eadb1 100644
--- a/stock_change_qty_reason/views/stock_inventory_line_reason_view.xml
+++ b/stock_change_qty_reason/views/stock_inventory_line_reason_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2019 ForgeFlow S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
@@ -11,28 +11,46 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="active_button_box">
-                        <button name="toggle_active" type="object"
-                                class="oe_stat_button" icon="fa-archive">
-                            <field name="active" widget="boolean_button"
-                                   options='{"terminology": "archive"}'/>
+                        <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>
-                        <field name="name"/>
-                        <field name="description"/>
+                        <field name="name" />
+                        <field name="description" />
                     </group>
                 </sheet>
             </form>
         </field>
     </record>
-
     <record id="action_change_qty_reasons_list" model="ir.actions.act_window">
-            <field name="name">Change Qty Reasons</field>
-            <field name="res_model">stock.inventory.line.reason</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_mode">list,form</field>
+        <field name="name">Change Qty Reasons</field>
+        <field name="res_model">stock.inventory.line.reason</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_mode">list,form</field>
     </record>
-
-    <menuitem id="menu_inventory_adjustments_config" name="Inventory Adjustment" parent="stock.menu_stock_config_settings" groups="stock.group_stock_manager" sequence="5"/>
-    <menuitem id="menu_reasons" name="Change Qty Reasons" parent="menu_inventory_adjustments_config" groups="stock_change_qty_reason.group_qty_reason_preset" action="action_change_qty_reasons_list" sequence="1"/>
+    <menuitem
+        id="menu_inventory_adjustments_config"
+        name="Inventory Adjustment"
+        parent="stock.menu_stock_config_settings"
+        groups="stock.group_stock_manager"
+        sequence="5"
+    />
+    <menuitem
+        id="menu_reasons"
+        name="Change Qty Reasons"
+        parent="menu_inventory_adjustments_config"
+        groups="stock_change_qty_reason.group_qty_reason_preset"
+        action="action_change_qty_reasons_list"
+        sequence="1"
+    />
 </odoo>
diff --git a/stock_change_qty_reason/views/stock_inventory_line_view.xml b/stock_change_qty_reason/views/stock_inventory_line_view.xml
index 05de8f3ef..32bad9428 100644
--- a/stock_change_qty_reason/views/stock_inventory_line_view.xml
+++ b/stock_change_qty_reason/views/stock_inventory_line_view.xml
@@ -1,49 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="reason_stock_inventory_line_tree" model="ir.ui.view">
         <field name="name">stock.inventory.line.tree</field>
         <field name="model">stock.inventory.line</field>
-        <field name="inherit_id" ref="stock.stock_inventory_line_tree"/>
+        <field name="inherit_id" ref="stock.stock_inventory_line_tree" />
         <field name="arch" type="xml">
             <field name="location_id" position="before">
-                <field name="reason"/>
+                <field name="reason" />
             </field>
         </field>
     </record>
-
     <record id="reason_stock_inventory_line_tree_reason_id" model="ir.ui.view">
         <field name="name">stock.inventory.line.tree.reason.code</field>
         <field name="model">stock.inventory.line</field>
-        <field name="inherit_id" ref="reason_stock_inventory_line_tree"/>
-        <field name="groups_id" eval="[(4, ref('stock_change_qty_reason.group_qty_reason_preset'))]"/>
+        <field name="inherit_id" ref="reason_stock_inventory_line_tree" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('stock_change_qty_reason.group_qty_reason_preset'))]"
+        />
         <field name="arch" type="xml">
             <field name="reason" position="replace">
-                <field name="preset_reason_id"/>
+                <field name="preset_reason_id" />
             </field>
         </field>
     </record>
-
     <record id="reason_stock_inventory_line_tree2" model="ir.ui.view">
         <field name="name">stock.inventory.line.tree</field>
         <field name="model">stock.inventory.line</field>
-        <field name="inherit_id" ref="stock.stock_inventory_line_tree2"/>
+        <field name="inherit_id" ref="stock.stock_inventory_line_tree2" />
         <field name="arch" type="xml">
             <field name="location_id" position="before">
-                <field name="reason"/>
+                <field name="reason" />
             </field>
         </field>
     </record>
-
     <record id="reason_stock_inventory_line_tree2_reason_id" model="ir.ui.view">
         <field name="name">stock.inventory.line.tree.reason.code</field>
         <field name="model">stock.inventory.line</field>
-        <field name="inherit_id" ref="reason_stock_inventory_line_tree2"/>
-        <field name="groups_id" eval="[(4, ref('stock_change_qty_reason.group_qty_reason_preset'))]"/>
+        <field name="inherit_id" ref="reason_stock_inventory_line_tree2" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('stock_change_qty_reason.group_qty_reason_preset'))]"
+        />
         <field name="arch" type="xml">
             <field name="reason" position="replace">
-                <field name="preset_reason_id"/>
+                <field name="preset_reason_id" />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_change_qty_reason/views/stock_inventory_view.xml b/stock_change_qty_reason/views/stock_inventory_view.xml
index 005b47d92..85d1e1706 100644
--- a/stock_change_qty_reason/views/stock_inventory_view.xml
+++ b/stock_change_qty_reason/views/stock_inventory_view.xml
@@ -1,26 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2019 ForgeFlow S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="reason_stock_inventory_form_inherit" model="ir.ui.view">
         <field name="name">stock.inventory.reason.form.inherit</field>
         <field name="model">stock.inventory</field>
-        <field name="inherit_id" ref="stock.view_inventory_form"/>
+        <field name="inherit_id" ref="stock.view_inventory_form" />
         <field name="arch" type="xml">
             <field name="company_id" position="after">
-                <field name="reason"/>
+                <field name="reason" />
             </field>
         </field>
     </record>
-
     <record id="preset_reason_stock_inventory_form_inherit" model="ir.ui.view">
         <field name="name">stock.inventory.reason.form.inherit.code</field>
         <field name="model">stock.inventory</field>
-        <field name="inherit_id" ref="reason_stock_inventory_form_inherit"/>
-        <field name="groups_id" eval="[(4, ref('stock_change_qty_reason.group_qty_reason_preset'))]"/>
+        <field name="inherit_id" ref="reason_stock_inventory_form_inherit" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('stock_change_qty_reason.group_qty_reason_preset'))]"
+        />
         <field name="arch" type="xml">
             <field name="reason" position="replace">
-                <field name="preset_reason_id"/>
+                <field name="preset_reason_id" />
             </field>
         </field>
     </record>
diff --git a/stock_demand_estimate/security/stock_security.xml b/stock_demand_estimate/security/stock_security.xml
index 24d61ad29..cb0aeaf24 100644
--- a/stock_demand_estimate/security/stock_security.xml
+++ b/stock_demand_estimate/security/stock_security.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
-        <record id="stock_demand_estimate_comp_rule" model="ir.rule">
-            <field name="name">Stock demand estimate multi-company</field>
-            <field name="model_id" ref="model_stock_demand_estimate"/>
-            <field name="global" eval="True"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-        </record>
-
+    <record id="stock_demand_estimate_comp_rule" model="ir.rule">
+        <field name="name">Stock demand estimate multi-company</field>
+        <field name="model_id" ref="model_stock_demand_estimate" />
+        <field name="global" eval="True" />
+        <field
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
 </odoo>
diff --git a/stock_demand_estimate/views/stock_demand_estimate_view.xml b/stock_demand_estimate/views/stock_demand_estimate_view.xml
index fd785e3a1..b9b01334b 100644
--- a/stock_demand_estimate/views/stock_demand_estimate_view.xml
+++ b/stock_demand_estimate/views/stock_demand_estimate_view.xml
@@ -1,23 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
-
     <record id="stock_demand_estimate_view_tree" model="ir.ui.view">
         <field name="name">stock.demand.estimate.tree</field>
         <field name="model">stock.demand.estimate</field>
         <field name="arch" type="xml">
             <tree>
-                <field name="date_from" string="Date From"/>
-                <field name="date_to" string="Date To"/>
-                <field name="product_id"/>
-                <field name="location_id"/>
-                <field name="product_uom_qty"/>
-                <field name="product_uom"/>
-                <field name="product_qty"/>
-                <field name="daily_qty"/>
+                <field name="date_from" string="Date From" />
+                <field name="date_to" string="Date To" />
+                <field name="product_id" />
+                <field name="location_id" />
+                <field name="product_uom_qty" />
+                <field name="product_uom" />
+                <field name="product_qty" />
+                <field name="daily_qty" />
             </tree>
         </field>
     </record>
-
     <record id="stock_demand_estimate_view_form" model="ir.ui.view">
         <field name="name">stock.demand.estimate.form</field>
         <field name="model">stock.demand.estimate</field>
@@ -26,68 +24,64 @@
                 <sheet>
                     <group>
                         <group name="dates_read" class="oe_read_only">
-                            <field name="date_from" string="Date From"/>
-                            <field name="date_to" string="Date To"/>
-                            <field name="duration" string="Duration"/>
+                            <field name="date_from" string="Date From" />
+                            <field name="date_to" string="Date To" />
+                            <field name="duration" string="Duration" />
                         </group>
-                         <group name="dates_edit" class="oe_edit_only">
-                            <field name="manual_date_from" string="Date From"/>
-                            <field name="manual_date_to" string="Date To"/>
-                             <field name="manual_duration" string="Duration"/>
+                        <group name="dates_edit" class="oe_edit_only">
+                            <field name="manual_date_from" string="Date From" />
+                            <field name="manual_date_to" string="Date To" />
+                            <field name="manual_duration" string="Duration" />
                         </group>
                         <group>
-                            <field name="product_id"/>
-                            <field name="location_id"/>
-                            <field name="product_uom_qty"/>
-                            <field name="product_uom"/>
-                            <field name="daily_qty"/>
+                            <field name="product_id" />
+                            <field name="location_id" />
+                            <field name="product_uom_qty" />
+                            <field name="product_uom" />
+                            <field name="daily_qty" />
                         </group>
                     </group>
                 </sheet>
             </form>
         </field>
     </record>
-
     <record id="stock_demand_estimate_view_pivot" model="ir.ui.view">
         <field name="name">stock.demand.estimate.pivot</field>
         <field name="model">stock.demand.estimate</field>
         <field name="arch" type="xml">
             <pivot string="Stock Demand Estimate">
-                <field name="product_qty" type="measure"/>
-                <field name="product_id" type="row"/>
-                <field name="date_from" type="col"/>
+                <field name="product_qty" type="measure" />
+                <field name="product_id" type="row" />
+                <field name="date_from" type="col" />
             </pivot>
         </field>
     </record>
-
-    <record id="stock_demand_estimate_view_search"
-            model="ir.ui.view">
+    <record id="stock_demand_estimate_view_search" model="ir.ui.view">
         <field name="name">stock.demand.estimate.search</field>
         <field name="model">stock.demand.estimate</field>
         <field name="arch" type="xml">
             <search string="Search Stock Demand Estimates">
-                <field name="product_id"/>
-                <field name="location_id"/>
+                <field name="product_id" />
+                <field name="location_id" />
             </search>
         </field>
     </record>
-
-    <record id="stock_demand_estimate_action"
-            model="ir.actions.act_window">
+    <record id="stock_demand_estimate_action" model="ir.actions.act_window">
         <field name="name">Stock Demand Estimates</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">stock.demand.estimate</field>
         <field name="view_mode">tree,form,pivot</field>
-        <field name="search_view_id"
-               ref="stock_demand_estimate_view_search"/>
+        <field name="search_view_id" ref="stock_demand_estimate_view_search" />
     </record>
-
-    <menuitem id="stock_demand_planning_menu" name="Demand Planning"
-              parent="stock.menu_stock_root" sequence="10"/>
-
+    <menuitem
+        id="stock_demand_planning_menu"
+        name="Demand Planning"
+        parent="stock.menu_stock_root"
+        sequence="10"
+    />
     <menuitem
         id="stock_demand_estimate_menu"
         parent="stock_demand_planning_menu"
-        action="stock_demand_estimate_action"/>
-
+        action="stock_demand_estimate_action"
+    />
 </odoo>
diff --git a/stock_inventory_chatter/data/stock_data.xml b/stock_inventory_chatter/data/stock_data.xml
index a6e72de6a..252ad7236 100644
--- a/stock_inventory_chatter/data/stock_data.xml
+++ b/stock_inventory_chatter/data/stock_data.xml
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-        <!-- Stock-related subtypes for messaging / Chatter -->
-        <record id="mt_inventory_confirmed" model="mail.message.subtype">
-            <field name="name">Inventory Confirmed</field>
-            <field name="res_model">stock.inventory</field>
-            <field name="default" eval="False"/>
-        </record>
-        <record id="mt_inventory_done" model="mail.message.subtype">
-            <field name="name">Inventory Done</field>
-            <field name="res_model">stock.inventory</field>
-            <field name="default" eval="False"/>
-        </record>
-
+    <!-- Stock-related subtypes for messaging / Chatter -->
+    <record id="mt_inventory_confirmed" model="mail.message.subtype">
+        <field name="name">Inventory Confirmed</field>
+        <field name="res_model">stock.inventory</field>
+        <field name="default" eval="False" />
+    </record>
+    <record id="mt_inventory_done" model="mail.message.subtype">
+        <field name="name">Inventory Done</field>
+        <field name="res_model">stock.inventory</field>
+        <field name="default" eval="False" />
+    </record>
 </odoo>
diff --git a/stock_inventory_chatter/views/stock_inventory_view.xml b/stock_inventory_chatter/views/stock_inventory_view.xml
index 02e9fbcc6..06a6bd498 100644
--- a/stock_inventory_chatter/views/stock_inventory_view.xml
+++ b/stock_inventory_chatter/views/stock_inventory_view.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
     <record id="view_inventory_form" model="ir.ui.view">
         <field name="name">Inventory form view - add chatter </field>
         <field name="model">stock.inventory</field>
-        <field name="inherit_id" ref="stock.view_inventory_form"/>
+        <field name="inherit_id" ref="stock.view_inventory_form" />
         <field name="arch" type="xml">
             <sheet position="after">
                 <div class="oe_chatter">
diff --git a/stock_inventory_discrepancy/security/stock_inventory_discrepancy_security.xml b/stock_inventory_discrepancy/security/stock_inventory_discrepancy_security.xml
index b0f079de9..b9d941028 100644
--- a/stock_inventory_discrepancy/security/stock_inventory_discrepancy_security.xml
+++ b/stock_inventory_discrepancy/security/stock_inventory_discrepancy_security.xml
@@ -1,29 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017-2020 ForgeFlow S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo noupdate="1">
-
     <record id="group_stock_inventory_validation" model="res.groups">
         <field name="name">Validate Inventory Adjustments Under Threshold</field>
-        <field name="category_id" ref="base.module_category_usability"/>
+        <field name="category_id" ref="base.module_category_usability" />
     </record>
     <record id="group_stock_inventory_validation_always" model="res.groups">
         <field name="name">Validate All inventory Adjustments</field>
-        <field name="category_id" ref="base.module_category_usability"/>
-        <field name="implied_ids"
-               eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        <field name="category_id" ref="base.module_category_usability" />
+        <field
+            name="implied_ids"
+            eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation'))]"
+        />
+        <field name="users" eval="[(4, ref('base.user_root'))]" />
     </record>
-
     <record model="res.groups" id="stock.group_stock_user">
-        <field name="implied_ids"
-               eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation'))]"/>
+        <field
+            name="implied_ids"
+            eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation'))]"
+        />
     </record>
-
     <record model="res.groups" id="stock.group_stock_manager">
-        <field name="implied_ids"
-               eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation_always'))]"/>
+        <field
+            name="implied_ids"
+            eval="[(4, ref('stock_inventory_discrepancy.group_stock_inventory_validation_always'))]"
+        />
     </record>
-
 </odoo>
diff --git a/stock_inventory_discrepancy/static/src/js/inventory_validate_button_controller.js b/stock_inventory_discrepancy/static/src/js/inventory_validate_button_controller.js
index d47f31035..57b0e6be4 100644
--- a/stock_inventory_discrepancy/static/src/js/inventory_validate_button_controller.js
+++ b/stock_inventory_discrepancy/static/src/js/inventory_validate_button_controller.js
@@ -1,38 +1,41 @@
-odoo.define('stock_inventory_discrepancy.InventoryValidationController', function (require) {
+odoo.define("stock_inventory_discrepancy.InventoryValidationController", function(
+    require
+) {
     "use strict";
 
-    var core = require('web.core');
-    var InventoryValidationController = require('stock.InventoryValidationController');
+    var core = require("web.core");
+    var InventoryValidationController = require("stock.InventoryValidationController");
 
     var _t = core._t;
 
     InventoryValidationController.include({
-
         /**
          * @override
          * @see displayNotification
          */
-        do_notify: function (title, message, sticky, className) {
+        do_notify: function(title, message, sticky, className) {
             var self = this;
             if (this.modelName === "stock.inventory.line") {
                 this._rpc({
-                    model: 'stock.inventory',
-                    method: 'read',
-                    args: [this.inventory_id, ['state']],
-                }).then(function (res) {
-                    if (res[0].state === "pending") {
-                        title = _t("Pending to Approve");
-                        message = _t("The inventory needs to be approved");
-                    }
-                }).finally(function () {
-                    return self.displayNotification({
-                        type: 'warning',
-                        title: title,
-                        message: message,
-                        sticky: sticky,
-                        className: className,
+                    model: "stock.inventory",
+                    method: "read",
+                    args: [this.inventory_id, ["state"]],
+                })
+                    .then(function(res) {
+                        if (res[0].state === "pending") {
+                            title = _t("Pending to Approve");
+                            message = _t("The inventory needs to be approved");
+                        }
+                    })
+                    .finally(function() {
+                        return self.displayNotification({
+                            type: "warning",
+                            title: title,
+                            message: message,
+                            sticky: sticky,
+                            className: className,
+                        });
                     });
-                });
             }
         },
     });
diff --git a/stock_inventory_discrepancy/views/assets_backend.xml b/stock_inventory_discrepancy/views/assets_backend.xml
index 4ec4d1381..829e9efef 100644
--- a/stock_inventory_discrepancy/views/assets_backend.xml
+++ b/stock_inventory_discrepancy/views/assets_backend.xml
@@ -1,10 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-    <template id="stock_assets_backend" name="stock_inventory assets" inherit_id="web.assets_backend">
+    <template
+        id="stock_assets_backend"
+        name="stock_inventory assets"
+        inherit_id="web.assets_backend"
+    >
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/stock_inventory_discrepancy/static/src/js/inventory_validate_button_controller.js"></script>
+            <script
+                type="text/javascript"
+                src="/stock_inventory_discrepancy/static/src/js/inventory_validate_button_controller.js"
+            />
         </xpath>
-   </template>
-
+    </template>
 </odoo>
diff --git a/stock_inventory_discrepancy/views/stock_inventory_view.xml b/stock_inventory_discrepancy/views/stock_inventory_view.xml
index 4007b2852..26927dd88 100644
--- a/stock_inventory_discrepancy/views/stock_inventory_view.xml
+++ b/stock_inventory_discrepancy/views/stock_inventory_view.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017-2020 ForgeFlow S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
     <record id="view_inventory_form" model="ir.ui.view">
         <field name="name">Inventory form view - discrepancy extension </field>
         <field name="model">stock.inventory</field>
-        <field name="inherit_id" ref="stock.view_inventory_form"/>
+        <field name="inherit_id" ref="stock.view_inventory_form" />
         <field name="arch" type="xml">
             <field name="state" position="attributes">
                 <attribute name="statusbar_visible">
@@ -17,42 +15,55 @@
                     {"pending":"red"}
                 </attribute>
             </field>
-            <xpath expr="//button[@name='action_validate']"
-                   position="attributes">
-                <attribute name="groups">stock_inventory_discrepancy.group_stock_inventory_validation</attribute>
+            <xpath expr="//button[@name='action_validate']" position="attributes">
+                <attribute
+                    name="groups"
+                >stock_inventory_discrepancy.group_stock_inventory_validation</attribute>
             </xpath>
-            <xpath expr="//button[@name='action_validate']"
-                   position="after">
-                <button name="action_force_done"
-                        string="Force Validation" type="object"
-                        class="oe_highlight"
-                        groups="stock_inventory_discrepancy.group_stock_inventory_validation_always"
-                        attrs="{'invisible': ['|',('state', '!=', 'pending'),('over_discrepancy_line_count', '=', 0)]}"/>
+            <xpath expr="//button[@name='action_validate']" position="after">
+                <button
+                    name="action_force_done"
+                    string="Force Validation"
+                    type="object"
+                    class="oe_highlight"
+                    groups="stock_inventory_discrepancy.group_stock_inventory_validation_always"
+                    attrs="{'invisible': ['|',('state', '!=', 'pending'),('over_discrepancy_line_count', '=', 0)]}"
+                />
             </xpath>
-            <xpath expr="//button[@name='action_open_inventory_lines']" position="attributes">
+            <xpath
+                expr="//button[@name='action_open_inventory_lines']"
+                position="attributes"
+            >
                 <attribute name="states">pending,confirm</attribute>
             </xpath>
-            <xpath expr="//button[@name='action_cancel_draft'][2]" position="attributes">
+            <xpath
+                expr="//button[@name='action_cancel_draft'][2]"
+                position="attributes"
+            >
                 <attribute name="states">pending,confirm</attribute>
             </xpath>
             <field name="company_id" position="before">
-                <field name="over_discrepancy_line_count" attrs="{'invisible': [('state', '!=', 'pending')]}"/>
+                <field
+                    name="over_discrepancy_line_count"
+                    attrs="{'invisible': [('state', '!=', 'pending')]}"
+                />
             </field>
         </field>
     </record>
-
     <record id="stock_inventory_line_tree2" model="ir.ui.view">
         <field name="name">stock.inventory.line.tree2</field>
         <field name="model">stock.inventory.line</field>
-        <field name="inherit_id" ref="stock.stock_inventory_line_tree2"/>
+        <field name="inherit_id" ref="stock.stock_inventory_line_tree2" />
         <field name="arch" type="xml">
             <field name="product_qty" position="after">
-                <field name="discrepancy_qty"/>
-                <field name="discrepancy_percent"/>
-                <field name="discrepancy_threshold"/>
+                <field name="discrepancy_qty" />
+                <field name="discrepancy_percent" />
+                <field name="discrepancy_threshold" />
             </field>
             <xpath expr="//tree" position="attributes">
-                <attribute name="decoration-danger">theoretical_qty &lt; 0 or discrepancy_percent &gt; discrepancy_threshold or "product_qty != theoretical_qty"</attribute>
+                <attribute
+                    name="decoration-danger"
+                >theoretical_qty &lt; 0 or discrepancy_percent &gt; discrepancy_threshold or "product_qty != theoretical_qty"</attribute>
             </xpath>
         </field>
     </record>
diff --git a/stock_inventory_discrepancy/views/stock_location_view.xml b/stock_inventory_discrepancy/views/stock_location_view.xml
index e745df75e..155d8e48b 100644
--- a/stock_inventory_discrepancy/views/stock_location_view.xml
+++ b/stock_inventory_discrepancy/views/stock_location_view.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017-2020 ForgeFlow S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
     <record id="view_location_form" model="ir.ui.view">
         <field name="name">Location form - cycle count extension</field>
         <field name="model">stock.location</field>
-        <field name="inherit_id" ref="stock.view_location_form"/>
+        <field name="inherit_id" ref="stock.view_location_form" />
         <field name="arch" type="xml">
             <field name="return_location" position="after">
-                <label for="discrepancy_threshold"/>
+                <label for="discrepancy_threshold" />
                 <div>
-                    <field name="discrepancy_threshold" class="oe_inline"/> %
+                    <field name="discrepancy_threshold" class="oe_inline" /> %
                 </div>
-                <field name="propagate_discrepancy_threshold"/>
+                <field name="propagate_discrepancy_threshold" />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_inventory_discrepancy/views/stock_warehouse_view.xml b/stock_inventory_discrepancy/views/stock_warehouse_view.xml
index c939180c3..70659e68d 100644
--- a/stock_inventory_discrepancy/views/stock_warehouse_view.xml
+++ b/stock_inventory_discrepancy/views/stock_warehouse_view.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017-2020 ForgeFlow S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
     <record id="view_warehouse" model="ir.ui.view">
         <field name="name">Warehouse form - Inventory Discrepancy
             extension</field>
         <field name="model">stock.warehouse</field>
-        <field name="inherit_id" ref="stock.view_warehouse"/>
+        <field name="inherit_id" ref="stock.view_warehouse" />
         <field name="arch" type="xml">
             <field name="partner_id" position="after">
-                <label for="discrepancy_threshold"/>
+                <label for="discrepancy_threshold" />
                 <div>
-                    <field name="discrepancy_threshold" class="oe_inline"/> %
+                    <field name="discrepancy_threshold" class="oe_inline" /> %
                 </div>
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_inventory_exclude_sublocation/views/stock_inventory_view.xml b/stock_inventory_exclude_sublocation/views/stock_inventory_view.xml
index cb845d0fa..26ba62492 100644
--- a/stock_inventory_exclude_sublocation/views/stock_inventory_view.xml
+++ b/stock_inventory_exclude_sublocation/views/stock_inventory_view.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2019 ForgeFlow S.L. (http://www.forgeflow.com)
      Copyright 2019 Tecnativa - Pedro M. Baeza
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
-<record id="view_inventory_form" model="ir.ui.view">
-    <field name="name">Inventory form view - stock_inventory_exclude_sublocation extension</field>
-    <field name="model">stock.inventory</field>
-    <field name="inherit_id" ref="stock.view_inventory_form"/>
-    <field name="arch" type="xml">
-        <field name="location_ids" position="after">
-            <field name="exclude_sublocation"
-                groups="stock.group_stock_multi_locations"
-            />
+    <record id="view_inventory_form" model="ir.ui.view">
+        <field
+            name="name"
+        >Inventory form view - stock_inventory_exclude_sublocation extension</field>
+        <field name="model">stock.inventory</field>
+        <field name="inherit_id" ref="stock.view_inventory_form" />
+        <field name="arch" type="xml">
+            <field name="location_ids" position="after">
+                <field
+                    name="exclude_sublocation"
+                    groups="stock.group_stock_multi_locations"
+                />
+            </field>
         </field>
-    </field>
-</record>
-
+    </record>
 </odoo>
diff --git a/stock_location_position/views/stock_location.xml b/stock_location_position/views/stock_location.xml
index 7b555893a..167605404 100644
--- a/stock_location_position/views/stock_location.xml
+++ b/stock_location_position/views/stock_location.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-
     <record id="stock_location_form_inherit" model="ir.ui.view">
         <field name="name">stock.location.inherit</field>
         <field name="model">stock.location</field>
-        <field name="inherit_id" ref="stock.view_location_form"/>
+        <field name="inherit_id" ref="stock.view_location_form" />
         <field name="arch" type="xml">
             <group name="additional_info" position="after">
                 <group name="position" string="Position">
@@ -19,13 +18,11 @@
             </group>
         </field>
     </record>
-
     <record id="view_location_search" model="ir.ui.view">
         <field name="name">view.location.search.inherit</field>
         <field name="model">stock.location</field>
-        <field name="inherit_id" ref="stock.view_location_search"/>
+        <field name="inherit_id" ref="stock.view_location_search" />
         <field name="arch" type="xml">
-
             <xpath expr="//search" position="inside">
                 <field name="corridor" />
                 <field name="row" />
@@ -35,8 +32,6 @@
                 <field name="posy" />
                 <field name="posz" />
             </xpath>
-
         </field>
     </record>
-
 </odoo>
diff --git a/stock_move_location/data/stock_quant_view.xml b/stock_move_location/data/stock_quant_view.xml
index a8e6f1baf..f446526b3 100644
--- a/stock_move_location/data/stock_quant_view.xml
+++ b/stock_move_location/data/stock_quant_view.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!--  To move quants directly from qants views  -->
-    <act_window id="wiz_stock_quant_location_action"
+    <act_window
+        id="wiz_stock_quant_location_action"
         name="Move to location..."
         res_model="wiz.stock.move.location"
         binding_model="stock.quant"
@@ -11,5 +11,4 @@
         target="new"
         groups="stock.group_stock_user"
     />
-
 </odoo>
diff --git a/stock_move_location/views/stock_picking_type_views.xml b/stock_move_location/views/stock_picking_type_views.xml
index a974b9d75..ed0a6d6db 100644
--- a/stock_move_location/views/stock_picking_type_views.xml
+++ b/stock_move_location/views/stock_picking_type_views.xml
@@ -1,32 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record model="ir.ui.view" id="view_picking_type_form">
         <field name="name">Operation Types</field>
         <field name="model">stock.picking.type</field>
-        <field name="inherit_id" ref="stock.view_picking_type_form"/>
+        <field name="inherit_id" ref="stock.view_picking_type_form" />
         <field name="arch" type="xml">
             <field name="show_operations" position="after">
-                <field name="show_move_onhand" attrs='{"invisible": [("code", "not in", ["internal"])]}'/>
+                <field
+                    name="show_move_onhand"
+                    attrs='{"invisible": [("code", "not in", ["internal"])]}'
+                />
             </field>
         </field>
     </record>
-
     <record id="stock_picking_type_kanban" model="ir.ui.view">
         <field name="model">stock.picking.type</field>
-        <field name="inherit_id" ref="stock.stock_picking_type_kanban"/>
+        <field name="inherit_id" ref="stock.stock_picking_type_kanban" />
         <field name="arch" type="xml">
             <field name="code" position="after">
-                <field name="show_move_onhand"/>
+                <field name="show_move_onhand" />
             </field>
             <xpath expr="//div[hasclass('o_kanban_primary_left')]" position="inside">
                 <div t-if="record.show_move_onhand.raw_value">
-                    <button name="action_move_location" type="object" class="btn btn-info" style="margin-top: 5px;">
+                    <button
+                        name="action_move_location"
+                        type="object"
+                        class="btn btn-info"
+                        style="margin-top: 5px;"
+                    >
                         Move On Hand
                     </button>
                 </div>
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_move_location/wizard/stock_move_location.xml b/stock_move_location/wizard/stock_move_location.xml
index 352e0817a..66b63f035 100644
--- a/stock_move_location/wizard/stock_move_location.xml
+++ b/stock_move_location/wizard/stock_move_location.xml
@@ -1,90 +1,148 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
-  <record id="view_wiz_stock_move_location_form_stock_move_location" model="ir.ui.view">
-    <field name="name">wiz.stock.move.location.form.stock_move_location</field>
-    <field name="model">wiz.stock.move.location</field>
-    <field name="arch" type="xml">
-      <form>
-        <sheet>
-          <div class="oe_button_box" name="button_box"/>
-           <div>
-              <label for="edit_locations">
+    <record
+        id="view_wiz_stock_move_location_form_stock_move_location"
+        model="ir.ui.view"
+    >
+        <field name="name">wiz.stock.move.location.form.stock_move_location</field>
+        <field name="model">wiz.stock.move.location</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <div class="oe_button_box" name="button_box" />
+                    <div>
+                        <label for="edit_locations">
                 Edit Locations
               </label>
-              <field name="edit_locations" widget="boolean_toggle"/>
-          </div>
-           <div groups="stock.group_stock_multi_locations">
-              <label for="apply_putaway_strategy">
+                        <field name="edit_locations" widget="boolean_toggle" />
+                    </div>
+                    <div groups="stock.group_stock_multi_locations">
+                        <label for="apply_putaway_strategy">
                 Apply putaway strategy for moving products
               </label>
-              <field name="apply_putaway_strategy" widget="boolean_toggle"/>
-          </div>
-          <group name="picking_type">
-              <field name="picking_type_id"/>
-          </group>
-          <group name="main">
-              <field name="origin_location_disable" invisible="True"/>
-              <field name="origin_location_id" attrs="{'readonly': [('origin_location_disable', '=', True)]}"/>
-              <field name="destination_location_disable" invisible="True"/>
-              <field name="destination_location_id" attrs="{'readonly': [('destination_location_disable', '=', True)]}"/>
-          </group>
-          <group name="lines">
-            <field name="stock_move_location_line_ids" nolabel="1" widget="one2many_list" mode="tree,kanban">
-              <tree string="Inventory Details" editable="bottom" decoration-info="move_quantity != max_quantity" decoration-danger="(move_quantity &lt; 0) or (move_quantity > max_quantity)" create="0">
-                  <field name="product_id"  domain="[('type','=','product')]"/>
-                  <field name="product_uom_id" string="UoM" groups="uom.group_uom"/>
-                  <field name="origin_location_id" readonly="1" force_save="1"/>
-                  <field name="destination_location_id" readonly="1" force_save="1"/>
-                  <field name="lot_id" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"  groups="stock.group_production_lot" options="{'no_create': True}"/>
-                  <field name="move_quantity"/>
-                  <field name="custom" invisible="1" />
-                  <field name="max_quantity" attrs="{'readonly': [('custom', '!=', True)]}" force_save="1"/>
-              </tree>
-              <kanban class="o_kanban_mobile">
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_global_click">
-                                <div class="o_kanban_record_body">
-                                    <field name="product_id"/>
-                                    <field name="product_uom_id"/>
-                                    <field name="lot_id" groups="stock.group_production_lot"/>
-                                    <field name="origin_location_id"/>
-                                    <field name="destination_location_id"/>
-                                </div>
-                                <div class="o_kanban_record_bottom">
-                                    <div class="oe_kanban_bottom_right">
-                                        <span><field name="move_quantity"/></span>
-                                    </div>
-                                </div>
-                            </div>
-                        </t>
-                    </templates>
-              </kanban>
-            </field>
-          </group>
-          <footer>
-            <button name="action_move_location" string="Immediate Transfer" type="object" class="btn-primary"/>
-            <button name="action_move_location" string="Planned Transfer" type="object" class="btn-primary" context="{'planned': True}"/>
-            <button special="cancel" string="Cancel" class="btn-default"/>
-          </footer>
-        </sheet>
-      </form>
-    </field>
-  </record>
-
-  <record id="wiz_stock_move_location_action" model="ir.actions.act_window">
-    <field name="name">Move from location...</field>
-    <field name="res_model">wiz.stock.move.location</field>
-    <field name="view_mode">form</field>
-    <field name="target">new</field>
-  </record>
-
-  <menuitem
-      id="menuitem_move_location"
-      string="Move from location..."
-      parent="stock.menu_stock_warehouse_mgmt"
-      action="wiz_stock_move_location_action"
-      sequence="99"/>
-
+                        <field name="apply_putaway_strategy" widget="boolean_toggle" />
+                    </div>
+                    <group name="picking_type">
+                        <field name="picking_type_id" />
+                    </group>
+                    <group name="main">
+                        <field name="origin_location_disable" invisible="True" />
+                        <field
+                            name="origin_location_id"
+                            attrs="{'readonly': [('origin_location_disable', '=', True)]}"
+                        />
+                        <field name="destination_location_disable" invisible="True" />
+                        <field
+                            name="destination_location_id"
+                            attrs="{'readonly': [('destination_location_disable', '=', True)]}"
+                        />
+                    </group>
+                    <group name="lines">
+                        <field
+                            name="stock_move_location_line_ids"
+                            nolabel="1"
+                            widget="one2many_list"
+                            mode="tree,kanban"
+                        >
+                            <tree
+                                string="Inventory Details"
+                                editable="bottom"
+                                decoration-info="move_quantity != max_quantity"
+                                decoration-danger="(move_quantity &lt; 0) or (move_quantity > max_quantity)"
+                                create="0"
+                            >
+                                <field
+                                    name="product_id"
+                                    domain="[('type','=','product')]"
+                                />
+                                <field
+                                    name="product_uom_id"
+                                    string="UoM"
+                                    groups="uom.group_uom"
+                                />
+                                <field
+                                    name="origin_location_id"
+                                    readonly="1"
+                                    force_save="1"
+                                />
+                                <field
+                                    name="destination_location_id"
+                                    readonly="1"
+                                    force_save="1"
+                                />
+                                <field
+                                    name="lot_id"
+                                    domain="[('product_id', '=', product_id)]"
+                                    context="{'default_product_id': product_id}"
+                                    groups="stock.group_production_lot"
+                                    options="{'no_create': True}"
+                                />
+                                <field name="move_quantity" />
+                                <field name="custom" invisible="1" />
+                                <field
+                                    name="max_quantity"
+                                    attrs="{'readonly': [('custom', '!=', True)]}"
+                                    force_save="1"
+                                />
+                            </tree>
+                            <kanban class="o_kanban_mobile">
+                                <templates>
+                                    <t t-name="kanban-box">
+                                        <div t-attf-class="oe_kanban_global_click">
+                                            <div class="o_kanban_record_body">
+                                                <field name="product_id" />
+                                                <field name="product_uom_id" />
+                                                <field
+                                                    name="lot_id"
+                                                    groups="stock.group_production_lot"
+                                                />
+                                                <field name="origin_location_id" />
+                                                <field name="destination_location_id" />
+                                            </div>
+                                            <div class="o_kanban_record_bottom">
+                                                <div class="oe_kanban_bottom_right">
+                                                    <span>
+                                                        <field name="move_quantity" />
+                                                    </span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </t>
+                                </templates>
+                            </kanban>
+                        </field>
+                    </group>
+                    <footer>
+                        <button
+                            name="action_move_location"
+                            string="Immediate Transfer"
+                            type="object"
+                            class="btn-primary"
+                        />
+                        <button
+                            name="action_move_location"
+                            string="Planned Transfer"
+                            type="object"
+                            class="btn-primary"
+                            context="{'planned': True}"
+                        />
+                        <button special="cancel" string="Cancel" class="btn-default" />
+                    </footer>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="wiz_stock_move_location_action" model="ir.actions.act_window">
+        <field name="name">Move from location...</field>
+        <field name="res_model">wiz.stock.move.location</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+    <menuitem
+        id="menuitem_move_location"
+        string="Move from location..."
+        parent="stock.menu_stock_warehouse_mgmt"
+        action="wiz_stock_move_location_action"
+        sequence="99"
+    />
 </odoo>
diff --git a/stock_orderpoint_manual_procurement/demo/product.xml b/stock_orderpoint_manual_procurement/demo/product.xml
index a2831566c..bd9a8997f 100644
--- a/stock_orderpoint_manual_procurement/demo/product.xml
+++ b/stock_orderpoint_manual_procurement/demo/product.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo noupdate="1">
     <record id="product_supplierinfo_product_7" model="product.supplierinfo">
-        <field name="product_tmpl_id" ref="product.product_product_7"/>
-        <field name="name" ref="base.res_partner_3"/>
+        <field name="product_tmpl_id" ref="product.product_product_7" />
+        <field name="name" ref="base.res_partner_3" />
         <field name="delay">3</field>
         <field name="min_qty">1</field>
         <field name="price">72</field>
diff --git a/stock_orderpoint_manual_procurement/security/stock_orderpoint_manual_procurement_security.xml b/stock_orderpoint_manual_procurement/security/stock_orderpoint_manual_procurement_security.xml
index 766864865..56bd905b4 100644
--- a/stock_orderpoint_manual_procurement/security/stock_orderpoint_manual_procurement_security.xml
+++ b/stock_orderpoint_manual_procurement/security/stock_orderpoint_manual_procurement_security.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo noupdate="1">
-
     <record id="group_change_orderpoint_procure_qty" model="res.groups">
-        <field name="name">Change quantity in manual procurements from reordering rules</field>
-        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
-        <field name="category_id" ref="base.module_category_hidden"/>
+        <field
+            name="name"
+        >Change quantity in manual procurements from reordering rules</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]" />
+        <field name="category_id" ref="base.module_category_hidden" />
     </record>
-
 </odoo>
diff --git a/stock_orderpoint_manual_procurement/views/stock_warehouse_orderpoint_view.xml b/stock_orderpoint_manual_procurement/views/stock_warehouse_orderpoint_view.xml
index 1088e2840..834331ffc 100644
--- a/stock_orderpoint_manual_procurement/views/stock_warehouse_orderpoint_view.xml
+++ b/stock_orderpoint_manual_procurement/views/stock_warehouse_orderpoint_view.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
-
     <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
         <field name="name">stock.warehouse.orderpoint.tree</field>
         <field name="model">stock.warehouse.orderpoint</field>
-        <field name="inherit_id"
-               ref="stock.view_warehouse_orderpoint_tree"/>
+        <field name="inherit_id" ref="stock.view_warehouse_orderpoint_tree" />
         <field name="arch" type="xml">
             <field name="product_uom" position="after">
-                <field name="procure_recommended_qty"/>
-                <field name="procure_recommended_date"/>
-                <button string="Create Procurement"
-                        name="%(stock_orderpoint_manual_procurement.act_make_procurement_from_orderpoint)d"
-                        icon="fa-cogs" type="action"/>
+                <field name="procure_recommended_qty" />
+                <field name="procure_recommended_date" />
+                <button
+                    string="Create Procurement"
+                    name="%(stock_orderpoint_manual_procurement.act_make_procurement_from_orderpoint)d"
+                    icon="fa-cogs"
+                    type="action"
+                />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_orderpoint_manual_procurement/wizards/make_procurement_orderpoint_view.xml b/stock_orderpoint_manual_procurement/wizards/make_procurement_orderpoint_view.xml
index 386a45130..004f72774 100644
--- a/stock_orderpoint_manual_procurement/wizards/make_procurement_orderpoint_view.xml
+++ b/stock_orderpoint_manual_procurement/wizards/make_procurement_orderpoint_view.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
-
     <!--  Make Procurement with security access right -->
     <record id="view_make_procurment_buffer_wizard" model="ir.ui.view">
         <field name="name">Request Procurement</field>
@@ -16,25 +15,35 @@
                 <group name="items" string="Items">
                     <field name="item_ids" nolabel="1">
                         <tree string="Items" nocreate="1" editable="top">
-                            <field name="orderpoint_id" invisible="True"/>
-                            <field name="warehouse_id" groups="stock.group_stock_multi_locations"/>
-                            <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                            <field name="product_id"/>
-                            <field name="qty"/>
-                            <field name="qty_without_security" invisible="1"/>
-                            <field name="uom_id" groups="uom.group_uom"/>
-                            <field name="date_planned"/>
+                            <field name="orderpoint_id" invisible="True" />
+                            <field
+                                name="warehouse_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                            <field
+                                name="location_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                            <field name="product_id" />
+                            <field name="qty" />
+                            <field name="qty_without_security" invisible="1" />
+                            <field name="uom_id" groups="uom.group_uom" />
+                            <field name="date_planned" />
                         </tree>
                     </field>
                 </group>
                 <footer>
-                    <button string="Execute" name="make_procurement" type="object" class="btn-primary"/>
-                    <button string="Cancel" class="btn-default" special="cancel"/>
+                    <button
+                        string="Execute"
+                        name="make_procurement"
+                        type="object"
+                        class="btn-primary"
+                    />
+                    <button string="Cancel" class="btn-default" special="cancel" />
                 </footer>
             </form>
         </field>
     </record>
-
     <!--  Make Procurement without security access right -->
     <record id="view_make_procure_without_security" model="ir.ui.view">
         <field name="name">Request Procurement</field>
@@ -50,33 +59,40 @@
                 <group name="items" string="Items">
                     <field name="item_ids" nolabel="1">
                         <tree string="Items" nocreate="1" editable="top">
-                            <field name="orderpoint_id" invisible="True"/>
-                            <field name="warehouse_id" groups="stock.group_stock_multi_locations"/>
-                            <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                            <field name="product_id"/>
-                            <field name="qty" invisible="1"/>
-                            <field name="qty_without_security" readonly="1"/>
-                            <field name="uom_id" groups="uom.group_uom"/>
-                            <field name="date_planned"/>
+                            <field name="orderpoint_id" invisible="True" />
+                            <field
+                                name="warehouse_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                            <field
+                                name="location_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                            <field name="product_id" />
+                            <field name="qty" invisible="1" />
+                            <field name="qty_without_security" readonly="1" />
+                            <field name="uom_id" groups="uom.group_uom" />
+                            <field name="date_planned" />
                         </tree>
                     </field>
                 </group>
                 <footer>
-                    <button string="Execute" name="make_procurement" type="object" class="btn-primary"/>
-                    <button string="Cancel" class="btn-default" special="cancel"/>
+                    <button
+                        string="Execute"
+                        name="make_procurement"
+                        type="object"
+                        class="btn-primary"
+                    />
+                    <button string="Cancel" class="btn-default" special="cancel" />
                 </footer>
             </form>
         </field>
     </record>
-
-    <record model="ir.actions.act_window"
-            id="act_make_procurement_from_orderpoint">
+    <record model="ir.actions.act_window" id="act_make_procurement_from_orderpoint">
         <field name="name">Request Procurement</field>
         <field name="res_model">make.procurement.orderpoint</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
-        <field name="binding_model_id"
-               ref="stock.model_stock_warehouse_orderpoint"/>
+        <field name="binding_model_id" ref="stock.model_stock_warehouse_orderpoint" />
     </record>
-
 </odoo>
diff --git a/stock_orderpoint_move_link/views/stock_move_views.xml b/stock_orderpoint_move_link/views/stock_move_views.xml
index d592a569a..610ea75b1 100644
--- a/stock_orderpoint_move_link/views/stock_move_views.xml
+++ b/stock_orderpoint_move_link/views/stock_move_views.xml
@@ -1,35 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <!-- Copyright 2016 Eficent Business and IT Consulting Services S.L.
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
 <odoo>
-
     <record id="view_move_form" model="ir.ui.view">
         <field name="name">stock.move.form</field>
         <field name="model">stock.move</field>
-        <field name="inherit_id" ref="stock.view_move_form"/>
+        <field name="inherit_id" ref="stock.view_move_form" />
         <field name="arch" type="xml">
             <field name="move_dest_ids" position="after">
-                <field name="orderpoint_ids"/>
+                <field name="orderpoint_ids" />
             </field>
         </field>
     </record>
-
     <record id="view_warehouse_orderpoint_move_form" model="ir.ui.view">
         <field name="name">stock.warehouse.orderpoint.move.form</field>
         <field name="model">stock.warehouse.orderpoint</field>
-        <field name="inherit_id" ref="stock.view_warehouse_orderpoint_form"/>
+        <field name="inherit_id" ref="stock.view_warehouse_orderpoint_form" />
         <field name="arch" type="xml">
             <div class="oe_title" position="before">
                 <div name="button_box" class="oe_button_box">
-                    <button type="object"
+                    <button
+                        type="object"
                         name="action_view_stock_picking"
                         class="oe_stat_button"
                         string="Transfers"
-                        icon="fa-arrows-h">
+                        icon="fa-arrows-h"
+                    >
                     </button>
                 </div>
             </div>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_orderpoint_purchase_link/views/purchase_order_views.xml b/stock_orderpoint_purchase_link/views/purchase_order_views.xml
index a4652cd69..49fc602ea 100644
--- a/stock_orderpoint_purchase_link/views/purchase_order_views.xml
+++ b/stock_orderpoint_purchase_link/views/purchase_order_views.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <!-- Copyright 2018 Eficent Business and IT Consulting Services S.L.
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
 <odoo>
     <record id="purchase_order_form" model="ir.ui.view">
         <field name="name">purchase.order.form</field>
         <field name="model">purchase.order</field>
-        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="inherit_id" ref="purchase.purchase_order_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@name='button_box']" position="inside">
 
             </xpath>
-            <xpath expr="//field[@name='order_line']/form//notebook"
-                   position="inside">
-                <page name="orderpoints" string="Orderpoints"
-                      groups="stock.group_stock_user">
-                    <field name="orderpoint_ids"/>
+            <xpath expr="//field[@name='order_line']/form//notebook" position="inside">
+                <page
+                    name="orderpoints"
+                    string="Orderpoints"
+                    groups="stock.group_stock_user"
+                >
+                    <field name="orderpoint_ids" />
                 </page>
             </xpath>
         </field>
     </record>
-
     <record id="purchase_order_line_form2" model="ir.ui.view">
         <field name="name">purchase.order.line.form2</field>
         <field name="model">purchase.order.line</field>
-        <field name="inherit_id" ref="purchase.purchase_order_line_form2"/>
+        <field name="inherit_id" ref="purchase.purchase_order_line_form2" />
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <separator string="Orderpoints"/>
-                <field name="orderpoint_ids"/>
+                <separator string="Orderpoints" />
+                <field name="orderpoint_ids" />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_orderpoint_uom/views/stock_warehouse_orderpoint_view.xml b/stock_orderpoint_uom/views/stock_warehouse_orderpoint_view.xml
index 6c7396558..b9b95b8be 100644
--- a/stock_orderpoint_uom/views/stock_warehouse_orderpoint_view.xml
+++ b/stock_orderpoint_uom/views/stock_warehouse_orderpoint_view.xml
@@ -1,31 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <odoo>
-
     <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
         <field name="name">stock.warehouse.orderpoint.tree</field>
         <field name="model">stock.warehouse.orderpoint</field>
-        <field name="inherit_id"
-               ref="stock.view_warehouse_orderpoint_tree"/>
+        <field name="inherit_id" ref="stock.view_warehouse_orderpoint_tree" />
         <field name="arch" type="xml">
             <field name="product_uom" position="after">
-                <field name="procure_uom_id" groups="uom.group_uom"/>
+                <field name="procure_uom_id" groups="uom.group_uom" />
             </field>
         </field>
     </record>
-
     <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
         <field name="name">stock.warehouse.orderpoint.form</field>
         <field name="model">stock.warehouse.orderpoint</field>
-        <field name="inherit_id"
-               ref="stock.view_warehouse_orderpoint_form"/>
+        <field name="inherit_id" ref="stock.view_warehouse_orderpoint_form" />
         <field name="arch" type="xml">
             <field name="product_id" position="after">
-                <field name="procure_uom_id" class="oe_inline" groups="uom.group_uom"/>
+                <field name="procure_uom_id" class="oe_inline" groups="uom.group_uom" />
             </field>
             <field name="qty_multiple" position="after">
                 <p class="oe_grey">Quantity Multiple is applied to the base UoM.</p>
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_removal_location_by_priority/security/stock_security.xml b/stock_removal_location_by_priority/security/stock_security.xml
index 7a49c05e5..8d03386fb 100644
--- a/stock_removal_location_by_priority/security/stock_security.xml
+++ b/stock_removal_location_by_priority/security/stock_security.xml
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017-18 Eficent Business and IT Consulting Services S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
     <record id="group_removal_priority" model="res.groups">
         <field name="name">Removal Priority</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
+        <field name="category_id" ref="base.module_category_hidden" />
     </record>
-
 </odoo>
diff --git a/stock_removal_location_by_priority/views/res_config_settings_views.xml b/stock_removal_location_by_priority/views/res_config_settings_views.xml
index 8e721744a..74cfc7412 100644
--- a/stock_removal_location_by_priority/views/res_config_settings_views.xml
+++ b/stock_removal_location_by_priority/views/res_config_settings_views.xml
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017-18 Eficent Business and IT Consulting Services S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record id="view_stock_config_settings" model="ir.ui.view">
         <field name="name">res.config.settings - removal_priority</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="stock.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="stock.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@id='warning_info']" position="after">
                 <div class="col-12 col-lg-6 o_setting_box" id="removal_priority">
                     <div class="o_setting_left_pane">
-                        <field name="group_removal_priority"/>
+                        <field name="group_removal_priority" />
                     </div>
                     <div class="o_setting_right_pane">
-                        <label for="group_removal_priority"/>
+                        <label for="group_removal_priority" />
                         <div class="text-muted">
                             Use <i>Removal Priority</i> in Locations
                         </div>
@@ -23,5 +22,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_removal_location_by_priority/views/stock_location_view.xml b/stock_removal_location_by_priority/views/stock_location_view.xml
index deef32a81..a3c9c2d6c 100644
--- a/stock_removal_location_by_priority/views/stock_location_view.xml
+++ b/stock_removal_location_by_priority/views/stock_location_view.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
     <record id="view_location_form" model="ir.ui.view">
         <field name="name">Location form - removal priority extension</field>
         <field name="model">stock.location</field>
-        <field name="inherit_id" ref="stock.view_location_form"/>
+        <field name="inherit_id" ref="stock.view_location_form" />
         <field name="arch" type="xml">
             <field name="removal_strategy_id" position="after">
-                <field name="removal_priority" groups="stock_removal_location_by_priority.group_removal_priority"/>
+                <field
+                    name="removal_priority"
+                    groups="stock_removal_location_by_priority.group_removal_priority"
+                />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_request/data/stock_request_sequence_data.xml b/stock_request/data/stock_request_sequence_data.xml
index 776483ecd..5b4161eff 100644
--- a/stock_request/data/stock_request_sequence_data.xml
+++ b/stock_request/data/stock_request_sequence_data.xml
@@ -1,20 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="seq_stock_request" model="ir.sequence">
         <field name="name">Stock Request</field>
         <field name="code">stock.request</field>
         <field name="prefix">SR/</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
-
     <record id="seq_stock_request_order" model="ir.sequence">
         <field name="name">Stock Request Order</field>
         <field name="code">stock.request.order</field>
         <field name="prefix">SRO/</field>
         <field name="padding">5</field>
-        <field name="company_id" eval="False"/>
+        <field name="company_id" eval="False" />
     </record>
-
 </odoo>
diff --git a/stock_request/security/stock_request_security.xml b/stock_request/security/stock_request_security.xml
index ca8610e34..abf154723 100644
--- a/stock_request/security/stock_request_security.xml
+++ b/stock_request/security/stock_request_security.xml
@@ -1,117 +1,123 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record model="ir.module.category" id="module_category_stock_request">
         <field name="name">Stock Request</field>
-        <field name="parent_id" ref="base.module_category_warehouse_management"/>
+        <field name="parent_id" ref="base.module_category_warehouse_management" />
         <field name="sequence">10</field>
     </record>
-
     <record id="group_stock_request_user" model="res.groups">
         <field name="name">Stock Request User</field>
-        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
-        <field name="category_id" ref="module_category_stock_request"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]" />
+        <field name="category_id" ref="module_category_stock_request" />
     </record>
-
     <record id="group_stock_request_manager" model="res.groups">
         <field name="name">Stock Request Manager</field>
-        <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
-        <field name="implied_ids"
-               eval="[(4, ref('stock_request.group_stock_request_user')),(4, ref('stock.group_stock_user'))]"/>
-        <field name="category_id" ref="module_category_stock_request"/>
+        <field
+            name="users"
+            eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
+        />
+        <field
+            name="implied_ids"
+            eval="[(4, ref('stock_request.group_stock_request_user')),(4, ref('stock.group_stock_user'))]"
+        />
+        <field name="category_id" ref="module_category_stock_request" />
     </record>
-
     <record id="group_stock_request_order" model="res.groups">
         <field name="name">Stock Request Order</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
+        <field name="category_id" ref="base.module_category_hidden" />
     </record>
-
     <record id="stock.group_stock_user" model="res.groups">
-        <field name="implied_ids"
-               eval="[(4, ref('group_stock_request_user'))]"/>
+        <field name="implied_ids" eval="[(4, ref('group_stock_request_user'))]" />
     </record>
-
     <data noupdate="1">
         <record model="ir.rule" id="stock_picking_rule">
             <field name="name">stock_request multi-company</field>
-            <field name="model_id" search="[('model','=','stock.request')]"
-                   model="ir.model"/>
-            <field name="global" eval="True"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+            <field
+                name="model_id"
+                search="[('model','=','stock.request')]"
+                model="ir.model"
+            />
+            <field name="global" eval="True" />
+            <field
+                name="domain_force"
+            >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
-
         <record id="stock_request_followers_rule" model="ir.rule">
             <field name="name">Follow Stock Request</field>
-            <field name="model_id" ref="model_stock_request"/>
-            <field name="groups" eval="[(6,0, [ref('group_stock_request_user')])]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field name="model_id" ref="model_stock_request" />
+            <field name="groups" eval="[(6,0, [ref('group_stock_request_user')])]" />
+            <field name="perm_read" eval="True" />
+            <field name="perm_write" eval="False" />
+            <field name="perm_create" eval="False" />
+            <field name="perm_unlink" eval="False" />
             <field name="domain_force">['|',('requested_by','=',user.id),
                                             ('message_partner_ids', 'in', [user.partner_id.id])]</field>
         </record>
-
         <record id="stock_request_rule" model="ir.rule">
             <field name="name">Stock Request User</field>
-            <field name="model_id" ref="model_stock_request"/>
-            <field name="groups" eval="[(6,0, [ref('group_stock_request_user')])]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field name="model_id" ref="model_stock_request" />
+            <field name="groups" eval="[(6,0, [ref('group_stock_request_user')])]" />
+            <field name="perm_read" eval="True" />
+            <field name="perm_write" eval="True" />
+            <field name="perm_create" eval="True" />
+            <field name="perm_unlink" eval="True" />
             <field name="domain_force">[('requested_by','=',user.id)]</field>
         </record>
-
         <record id="stock_request_manager_rule" model="ir.rule">
             <field name="name">Stock Request Manager</field>
-            <field name="model_id" ref="model_stock_request"/>
-            <field name="groups" eval="[(6,0, [ref('group_stock_request_manager')])]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field name="model_id" ref="model_stock_request" />
+            <field name="groups" eval="[(6,0, [ref('group_stock_request_manager')])]" />
+            <field name="perm_read" eval="True" />
+            <field name="perm_write" eval="True" />
+            <field name="perm_create" eval="True" />
+            <field name="perm_unlink" eval="True" />
         </record>
-
         <record model="ir.rule" id="stock_request_order_picking_rule">
             <field name="name">stock_request_order multi-company</field>
-            <field name="model_id" ref="model_stock_request_order"/>
-            <field name="global" eval="True"/>
-            <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+            <field name="model_id" ref="model_stock_request_order" />
+            <field name="global" eval="True" />
+            <field
+                name="domain_force"
+            >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
-
         <record id="stock_request_order_followers_rule" model="ir.rule">
             <field name="name">Follow Stock Request Order</field>
-            <field name="model_id" ref="model_stock_request_order"/>
-            <field name="groups" eval="[(6,0, [ref('stock_request.group_stock_request_user')])]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
+            <field name="model_id" ref="model_stock_request_order" />
+            <field
+                name="groups"
+                eval="[(6,0, [ref('stock_request.group_stock_request_user')])]"
+            />
+            <field name="perm_read" eval="True" />
+            <field name="perm_write" eval="False" />
+            <field name="perm_create" eval="False" />
+            <field name="perm_unlink" eval="False" />
             <field name="domain_force">['|',('requested_by','=',user.id),
                                             ('message_partner_ids', 'in', [user.partner_id.id])]</field>
         </record>
-
         <record id="stock_request_order_rule" model="ir.rule">
             <field name="name">Stock Request Order User</field>
-            <field name="model_id" ref="model_stock_request_order"/>
-            <field name="groups" eval="[(6,0, [ref('stock_request.group_stock_request_user')])]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field name="model_id" ref="model_stock_request_order" />
+            <field
+                name="groups"
+                eval="[(6,0, [ref('stock_request.group_stock_request_user')])]"
+            />
+            <field name="perm_read" eval="True" />
+            <field name="perm_write" eval="True" />
+            <field name="perm_create" eval="True" />
+            <field name="perm_unlink" eval="True" />
             <field name="domain_force">[('requested_by','=',user.id)]</field>
         </record>
-
         <record id="stock_request_order_manager_rule" model="ir.rule">
             <field name="name">Stock Request Manager</field>
-            <field name="model_id" ref="model_stock_request_order"/>
-            <field name="groups" eval="[(6,0, [ref('stock_request.group_stock_request_manager')])]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_unlink" eval="True"/>
+            <field name="model_id" ref="model_stock_request_order" />
+            <field
+                name="groups"
+                eval="[(6,0, [ref('stock_request.group_stock_request_manager')])]"
+            />
+            <field name="perm_read" eval="True" />
+            <field name="perm_write" eval="True" />
+            <field name="perm_create" eval="True" />
+            <field name="perm_unlink" eval="True" />
         </record>
     </data>
-
 </odoo>
diff --git a/stock_request/views/product.xml b/stock_request/views/product.xml
index ac60d5cf5..33e11a221 100644
--- a/stock_request/views/product.xml
+++ b/stock_request/views/product.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="action_variant_generate_stock_request_orders" model="ir.actions.server">
         <field name="name">Request Stock</field>
         <field name="type">ir.actions.server</field>
         <field name="state">code</field>
-        <field name="model_id" ref="product.model_product_product"/>
-        <field name="binding_model_id" ref="product.model_product_product"/>
+        <field name="model_id" ref="product.model_product_product" />
+        <field name="binding_model_id" ref="product.model_product_product" />
         <field name="code">
 action = records.env['stock.request.order']._create_from_product_multiselect(records)
         </field>
     </record>
-
-    <record id="action_template_generate_stock_request_orders" model="ir.actions.server">
+    <record
+        id="action_template_generate_stock_request_orders"
+        model="ir.actions.server"
+    >
         <field name="name">Request Stock</field>
         <field name="type">ir.actions.server</field>
         <field name="state">code</field>
-        <field name="model_id" ref="product.model_product_template"/>
-        <field name="binding_model_id" ref="product.model_product_template"/>
+        <field name="model_id" ref="product.model_product_template" />
+        <field name="binding_model_id" ref="product.model_product_template" />
         <field name="code">
 action = records.env['stock.request.order']._create_from_product_multiselect(records)
         </field>
     </record>
-
 </odoo>
diff --git a/stock_request/views/res_config_settings_views.xml b/stock_request/views/res_config_settings_views.xml
index 9028743d6..6c06d067a 100644
--- a/stock_request/views/res_config_settings_views.xml
+++ b/stock_request/views/res_config_settings_views.xml
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
 <!--
     Copyright 2018 Creu Blanca
     License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 -->
-
 <odoo>
-
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="name">res.config.settings.view.form.inherit.stock_request</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block"
-                     data-string="Stock Request" data-key="stock_request"
-                     groups="stock_request.group_stock_request_manager">
+                <div
+                    class="app_settings_block"
+                    data-string="Stock Request"
+                    data-key="stock_request"
+                    groups="stock_request.group_stock_request_manager"
+                >
                     <h2>Orders &amp; Configuration</h2>
                     <div class="row mt16 o_settings_container" id="stock_request">
                         <div class="col-xs-12 col-md-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="group_stock_request_order"/>
+                                <field name="group_stock_request_order" />
                             </div>
                             <div class="o_setting_right_pane">
-                                <label string="Enable Orders"
-                                       for="group_stock_request_order"/>
+                                <label
+                                    string="Enable Orders"
+                                    for="group_stock_request_order"
+                                />
                                 <div class="text-muted">
                                     Activates Stock Request Orders
                                 </div>
@@ -32,10 +34,13 @@
                         </div>
                         <div class="col-xs-12 col-md-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="stock_request_allow_virtual_loc"/>
+                                <field name="stock_request_allow_virtual_loc" />
                             </div>
                             <div class="o_setting_right_pane">
-                                <label string="Allow All Locations Types" for="stock_request_allow_virtual_loc"/>
+                                <label
+                                    string="Allow All Locations Types"
+                                    for="stock_request_allow_virtual_loc"
+                                />
                                 <div class="text-muted">
                                     By default only internal and transit locations are allowed in Stock Request and Orders.
                                 </div>
@@ -43,11 +48,13 @@
                         </div>
                         <div class="col-xs-12 col-md-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_stock_request_submit"/>
+                                <field name="module_stock_request_submit" />
                             </div>
                             <div class="o_setting_right_pane">
-                                <label string="Enable Submitted State"
-                                       for="module_stock_request_purchase"/>
+                                <label
+                                    string="Enable Submitted State"
+                                    for="module_stock_request_purchase"
+                                />
                                 <div class="text-muted">
                                     Add State to Stock Request and Stock Request Orders if activated.
                                 </div>
@@ -55,14 +62,19 @@
                         </div>
                     </div>
                     <h2>Purchases</h2>
-                    <div class="row mt16 o_settings_container" id="stock_request_purchase">
+                    <div
+                        class="row mt16 o_settings_container"
+                        id="stock_request_purchase"
+                    >
                         <div class="col-xs-12 col-md-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_stock_request_purchase"/>
+                                <field name="module_stock_request_purchase" />
                             </div>
                             <div class="o_setting_right_pane">
-                                <label string="Enable Stock Requests for Purchases"
-                                       for="module_stock_request_purchase"/>
+                                <label
+                                    string="Enable Stock Requests for Purchases"
+                                    for="module_stock_request_purchase"
+                                />
                                 <div class="text-muted">
                                     Use Purchases with Stock Requests
                                 </div>
@@ -70,14 +82,19 @@
                         </div>
                     </div>
                     <h2>Kanban</h2>
-                    <div class="row mt16 o_settings_container" id="stock_request_purchase">
+                    <div
+                        class="row mt16 o_settings_container"
+                        id="stock_request_purchase"
+                    >
                         <div class="col-xs-12 col-md-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_stock_request_kanban"/>
+                                <field name="module_stock_request_kanban" />
                             </div>
                             <div class="o_setting_right_pane">
-                                <label string="Enable Stock Requests Kanban cards"
-                                       for="module_stock_request_purchase"/>
+                                <label
+                                    string="Enable Stock Requests Kanban cards"
+                                    for="module_stock_request_purchase"
+                                />
                                 <div class="text-muted">
                                     Use Kanban cards for consumable products
                                 </div>
@@ -85,14 +102,19 @@
                         </div>
                     </div>
                     <h2>Analytic</h2>
-                    <div class="row mt16 o_settings_container" id="stock_request_analytic">
+                    <div
+                        class="row mt16 o_settings_container"
+                        id="stock_request_analytic"
+                    >
                         <div class="col-xs-12 col-md-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_stock_request_analytic"/>
+                                <field name="module_stock_request_analytic" />
                             </div>
                             <div class="o_setting_right_pane">
-                                <label string="Enable Analytic Accounting in Stock Requests"
-                                       for="module_stock_request_analytic"/>
+                                <label
+                                    string="Enable Analytic Accounting in Stock Requests"
+                                    for="module_stock_request_analytic"
+                                />
                                 <div class="text-muted">
                                     Analytic accounting in Stock Requests
                                 </div>
@@ -103,7 +125,6 @@
             </xpath>
         </field>
     </record>
-
     <record id="action_stock_request_config" model="ir.actions.act_window">
         <field name="name">Settings</field>
         <field name="type">ir.actions.act_window</field>
@@ -112,5 +133,4 @@
         <field name="target">inline</field>
         <field name="context">{'module' : 'stock_request'}</field>
     </record>
-
 </odoo>
diff --git a/stock_request/views/stock_move_views.xml b/stock_request/views/stock_move_views.xml
index c7b4cc4e5..e2d0b8657 100644
--- a/stock_request/views/stock_move_views.xml
+++ b/stock_request/views/stock_move_views.xml
@@ -1,31 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_stock_move_operations" model="ir.ui.view">
         <field name="name">stock.move.operations.form</field>
         <field name="model">stock.move</field>
-        <field name="inherit_id" ref="stock.view_stock_move_operations"/>
+        <field name="inherit_id" ref="stock.view_stock_move_operations" />
         <field name="arch" type="xml">
             <field name="move_line_ids" position="after">
-                <newline/>
-                <field name="allocation_ids"/>
+                <newline />
+                <field name="allocation_ids" />
             </field>
         </field>
     </record>
-
     <record id="view_move_form" model="ir.ui.view">
         <field name="name">stock.move.form</field>
         <field name="model">stock.move</field>
-        <field name="inherit_id" ref="stock.view_move_form"/>
+        <field name="inherit_id" ref="stock.view_move_form" />
         <field name="arch" type="xml">
             <group name="linked_group" position="after">
-                <newline/>
-                <group name="allocations"
-                       string="Stock Request Allocations">
-                    <field name="allocation_ids"/>
+                <newline />
+                <group name="allocations" string="Stock Request Allocations">
+                    <field name="allocation_ids" />
                 </group>
             </group>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_request/views/stock_picking_views.xml b/stock_request/views/stock_picking_views.xml
index 1ab3802d9..a35f92ec3 100644
--- a/stock_request/views/stock_picking_views.xml
+++ b/stock_request/views/stock_picking_views.xml
@@ -1,24 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_picking_form" model="ir.ui.view">
         <field name="name">stock.picking.form</field>
         <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form"/>
-        <field eval="12" name="priority"/>
+        <field name="inherit_id" ref="stock.view_picking_form" />
+        <field eval="12" name="priority" />
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <button type="object"
-                        name="action_view_stock_request"
-                        class="oe_stat_button"
-                        icon="fa-chain"
-                        attrs="{'invisible':[('stock_request_ids', '=', [])]}">
-                    <field name="stock_request_count" widget="statinfo"
-                           string="Stock Requests"/>
-                    <field name="stock_request_ids" invisible="1"/>
+                <button
+                    type="object"
+                    name="action_view_stock_request"
+                    class="oe_stat_button"
+                    icon="fa-chain"
+                    attrs="{'invisible':[('stock_request_ids', '=', [])]}"
+                >
+                    <field
+                        name="stock_request_count"
+                        widget="statinfo"
+                        string="Stock Requests"
+                    />
+                    <field name="stock_request_ids" invisible="1" />
                 </button>
             </div>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_request/views/stock_request_allocation_views.xml b/stock_request/views/stock_request_allocation_views.xml
index 5b1325953..5fd01e05a 100644
--- a/stock_request/views/stock_request_allocation_views.xml
+++ b/stock_request/views/stock_request_allocation_views.xml
@@ -1,27 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Eficent
      License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record id="view_stock_request_allocation_tree" model="ir.ui.view">
         <field name="name">stock.request.allocation.tree</field>
         <field name="model">stock.request.allocation</field>
         <field name="arch" type="xml">
             <tree string="Stock Request Allocations">
-                <field name="stock_request_id"/>
-                <field name="stock_move_id"/>
-                <field name="product_id"/>
-                <field name="requested_product_uom_qty"/>
-                <field name="product_uom_id"
-                       options="{'no_open': True, 'no_create': True}" groups="uom.group_uom"/>
-                <field name="requested_product_qty"/>
-                <field name="allocated_product_qty"/>
+                <field name="stock_request_id" />
+                <field name="stock_move_id" />
+                <field name="product_id" />
+                <field name="requested_product_uom_qty" />
+                <field
+                    name="product_uom_id"
+                    options="{'no_open': True, 'no_create': True}"
+                    groups="uom.group_uom"
+                />
+                <field name="requested_product_qty" />
+                <field name="allocated_product_qty" />
                 <field name="open_product_qty" />
-                <field name="company_id" groups="base.group_multi_company"/>
+                <field name="company_id" groups="base.group_multi_company" />
             </tree>
         </field>
     </record>
-
     <record id="view_stock_request_allocation_form" model="ir.ui.view">
         <field name="name">stock.request.allocation.form</field>
         <field name="model">stock.request.allocation</field>
@@ -30,24 +31,29 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="stock_request_id"/>
-                            <field name="stock_move_id"/>
+                            <field name="stock_request_id" />
+                            <field name="stock_move_id" />
                         </group>
                         <group>
-                            <field name="product_id"/>
-                            <field name="requested_product_uom_qty"/>
-                            <field name="product_uom_id"
-                                   options="{'no_open': True, 'no_create': True}"
-                                   groups="uom.group_uom"/>
-                            <field name="requested_product_qty"/>
-                            <field name="allocated_product_qty"/>
+                            <field name="product_id" />
+                            <field name="requested_product_uom_qty" />
+                            <field
+                                name="product_uom_id"
+                                options="{'no_open': True, 'no_create': True}"
+                                groups="uom.group_uom"
+                            />
+                            <field name="requested_product_qty" />
+                            <field name="allocated_product_qty" />
                             <field name="open_product_qty" />
-                            <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                                options="{'no_create': True}"
+                            />
                         </group>
                     </group>
                 </sheet>
             </form>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_request/views/stock_request_menu.xml b/stock_request/views/stock_request_menu.xml
index 0fc6a9a46..42a2e99a0 100644
--- a/stock_request/views/stock_request_menu.xml
+++ b/stock_request/views/stock_request_menu.xml
@@ -5,42 +5,47 @@
         name="Stock Requests"
         groups="stock_request.group_stock_request_user,stock_request.group_stock_request_manager"
         web_icon="stock_request,static/description/icon.png"
-        sequence="100"/>
-
+        sequence="100"
+    />
     <menuitem
         id="menu_stock_request_operations"
         parent="menu_stock_request_root"
         name="Operations"
-        sequence="10"/>
-
-    <menuitem id="stock_request_order_menu"
-              name="Stock Request Orders"
-              parent="menu_stock_request_operations"
-              action="stock_request_order_action"
-              groups="group_stock_request_order"
-              sequence="20"/>
-
+        sequence="10"
+    />
+    <menuitem
+        id="stock_request_order_menu"
+        name="Stock Request Orders"
+        parent="menu_stock_request_operations"
+        action="stock_request_order_action"
+        groups="group_stock_request_order"
+        sequence="20"
+    />
     <menuitem
         id="menu_stock_request"
         action="action_stock_request_form"
-        name="Stock Requests" parent="menu_stock_request_operations"
-        sequence="30"/>
-
+        name="Stock Requests"
+        parent="menu_stock_request_operations"
+        sequence="30"
+    />
     <menuitem
         id="menu_stock_request_master_data"
         parent="menu_stock_request_root"
         name="Master Data"
-        sequence="100"/>
-
+        sequence="100"
+    />
     <menuitem
         id="menu_stock_request_master_data"
         parent="menu_stock_request_root"
         name="Master Data"
-        sequence="100"/>
-
-    <menuitem id="menu_stock_request_config" name="Settings"
-              parent="menu_stock_request_root"
-              sequence="999" action="action_stock_request_config"
-              groups="base.group_system"/>
-
+        sequence="100"
+    />
+    <menuitem
+        id="menu_stock_request_config"
+        name="Settings"
+        parent="menu_stock_request_root"
+        sequence="999"
+        action="action_stock_request_config"
+        groups="base.group_system"
+    />
 </odoo>
diff --git a/stock_request/views/stock_request_order_views.xml b/stock_request/views/stock_request_order_views.xml
index 24f0e030a..adb67ead7 100644
--- a/stock_request/views/stock_request_order_views.xml
+++ b/stock_request/views/stock_request_order_views.xml
@@ -1,86 +1,113 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-
     <record model="ir.ui.view" id="stock_request_order_tree">
         <field name="name">stock.request.order.tree</field>
         <field name="model">stock.request.order</field>
         <field name="arch" type="xml">
             <tree string="Stock requests">
-                <field name="name"/>
-                <field name="warehouse_id"
-                       groups="stock.group_stock_multi_locations"/>
-                <field name="location_id"
-                       groups="stock.group_stock_multi_locations"/>
-                <field name="state"/>
+                <field name="name" />
+                <field name="warehouse_id" groups="stock.group_stock_multi_locations" />
+                <field name="location_id" groups="stock.group_stock_multi_locations" />
+                <field name="state" />
             </tree>
         </field>
     </record>
-
     <record model="ir.ui.view" id="stock_request_order_form">
         <field name="name">stock.request.order.form</field>
         <field name="model">stock.request.order</field>
         <field name="arch" type="xml">
             <form string="Stock request">
                 <header>
-                    <button name="action_confirm"
-                            string="Confirm" type="object"
-                            attrs="{'invisible': [('state', 'not in', ['draft'])]}"/>
-                    <button name="action_cancel" states="draft,open"
-                            type="object" string="Cancel"/>
-                    <button name="action_draft" states="cancel" type="object"
-                            string="Set to Draft"/>
-                    <field name="state" widget="statusbar"/>
+                    <button
+                        name="action_confirm"
+                        string="Confirm"
+                        type="object"
+                        attrs="{'invisible': [('state', 'not in', ['draft'])]}"
+                    />
+                    <button
+                        name="action_cancel"
+                        states="draft,open"
+                        type="object"
+                        string="Cancel"
+                    />
+                    <button
+                        name="action_draft"
+                        states="cancel"
+                        type="object"
+                        string="Set to Draft"
+                    />
+                    <field name="state" widget="statusbar" />
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <field name="picking_ids" invisible="1"/>
-                        <button type="object"
-                                name="action_view_transfer"
-                                class="oe_stat_button"
-                                icon="fa-truck"
-                                attrs="{'invisible': [('picking_count', '=', 0)]}"
-                                groups="stock.group_stock_user">
-                            <field name="picking_count" widget="statinfo"
-                                   string="Transfers"/>
-                        </button>
-                        <button type="object"
-                                name="action_view_stock_requests"
-                                class="oe_stat_button"
-                                icon="fa-chain"
-                                attrs="{'invisible': [('state', '=', 'draft')]}"
-                                groups="stock.group_stock_user"
+                        <field name="picking_ids" invisible="1" />
+                        <button
+                            type="object"
+                            name="action_view_transfer"
+                            class="oe_stat_button"
+                            icon="fa-truck"
+                            attrs="{'invisible': [('picking_count', '=', 0)]}"
+                            groups="stock.group_stock_user"
                         >
-                            <field name="stock_request_count" widget="statinfo"
-                                   string="Stock Requests"/>
+                            <field
+                                name="picking_count"
+                                widget="statinfo"
+                                string="Transfers"
+                            />
+                        </button>
+                        <button
+                            type="object"
+                            name="action_view_stock_requests"
+                            class="oe_stat_button"
+                            icon="fa-chain"
+                            attrs="{'invisible': [('state', '=', 'draft')]}"
+                            groups="stock.group_stock_user"
+                        >
+                            <field
+                                name="stock_request_count"
+                                widget="statinfo"
+                                string="Stock Requests"
+                            />
                         </button>
                     </div>
                     <div class="oe_title">
-                        <label for="name" string="Stock Request"/>
+                        <label for="name" string="Stock Request" />
                         <h1>
-                            <field name="name" readonly="1"/>
+                            <field name="name" readonly="1" />
                         </h1>
                     </div>
                     <group>
                         <group>
-                            <field name="expected_date"/>
-                            <field name="picking_policy"/>
+                            <field name="expected_date" />
+                            <field name="picking_policy" />
                         </group>
                         <group>
-                            <field name="warehouse_id" widget="selection"
-                                   groups="stock.group_stock_multi_locations"/>
-                            <field name="location_id"
-                                   groups="stock.group_stock_multi_locations"/>
-                            <field name="allow_virtual_location" invisible="1"/>
-                            <field name="procurement_group_id"
-                                   groups="stock.group_adv_location"/>
-                            <field name="company_id"
-                                   groups="base.group_multi_company"
-                                   options="{'no_create': True}"/>
+                            <field
+                                name="warehouse_id"
+                                widget="selection"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                            <field
+                                name="location_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                            <field name="allow_virtual_location" invisible="1" />
+                            <field
+                                name="procurement_group_id"
+                                groups="stock.group_adv_location"
+                            />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                                options="{'no_create': True}"
+                            />
                         </group>
                     </group>
                     <notebook>
                         <page name="items" string="Items">
-                            <field name="stock_request_ids" context="{
+                            <field
+                                name="stock_request_ids"
+                                context="{
                             'default_expected_date':expected_date,
                             'default_picking_policy': picking_policy,
                             'default_warehouse_id': warehouse_id,
@@ -88,50 +115,50 @@
                             'default_procurement_group_id': procurement_group_id,
                             'default_company_id': company_id,
                             'default_state': state,
-                            }" attrs="{'readonly': [('state', '!=', 'draft')]}">
+                            }"
+                                attrs="{'readonly': [('state', '!=', 'draft')]}"
+                            >
                                 <tree editable="bottom">
-                                    <field name="name" readonly="1"/>
-                                    <field name="product_id"/>
-                                    <field name="product_uom_id"
-                                           options="{'no_open': True, 'no_create': True}"
-                                           groups="uom.group_uom"/>
-                                    <field name="route_id"
-                                           options="{'no_create': True}"
-                                           groups="stock.group_stock_multi_locations"/>
-                                    <field name="route_ids" invisible="1"/>
-                                    <field name="product_uom_qty"/>
-                                    <field name="qty_in_progress"/>
-                                    <field name="qty_done"/>
-                                    <field name="expected_date" invisible="1"/>
-                                    <field name="picking_policy"
-                                           invisible="1"/>
-                                    <field name="warehouse_id" invisible="1"/>
-                                    <field name="location_id" invisible="1"/>
-                                    <field name="procurement_group_id"
-                                           invisible="1"/>
-                                    <field name="company_id" invisible="1"/>
-                                    <field name="state"/>
+                                    <field name="name" readonly="1" />
+                                    <field name="product_id" />
+                                    <field
+                                        name="product_uom_id"
+                                        options="{'no_open': True, 'no_create': True}"
+                                        groups="uom.group_uom"
+                                    />
+                                    <field
+                                        name="route_id"
+                                        options="{'no_create': True}"
+                                        groups="stock.group_stock_multi_locations"
+                                    />
+                                    <field name="route_ids" invisible="1" />
+                                    <field name="product_uom_qty" />
+                                    <field name="qty_in_progress" />
+                                    <field name="qty_done" />
+                                    <field name="expected_date" invisible="1" />
+                                    <field name="picking_policy" invisible="1" />
+                                    <field name="warehouse_id" invisible="1" />
+                                    <field name="location_id" invisible="1" />
+                                    <field name="procurement_group_id" invisible="1" />
+                                    <field name="company_id" invisible="1" />
+                                    <field name="state" />
                                 </tree>
                             </field>
                         </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids"
-                           widget="mail_followers"/>
-                    <field name="activity_ids" widget="mail_activity"/>
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="activity_ids" widget="mail_activity" />
+                    <field name="message_ids" widget="mail_thread" />
                 </div>
             </form>
         </field>
     </record>
-
-    <record model="ir.actions.act_window"
-            id="stock_request_order_action">
+    <record model="ir.actions.act_window" id="stock_request_order_action">
         <field name="name">Stock Request Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">stock.request.order</field>
         <field name="view_mode">tree,form</field>
     </record>
-
 </odoo>
diff --git a/stock_request/views/stock_request_views.xml b/stock_request/views/stock_request_views.xml
index 1c3812a35..ae77ecb51 100644
--- a/stock_request/views/stock_request_views.xml
+++ b/stock_request/views/stock_request_views.xml
@@ -1,113 +1,175 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Eficent
      License LGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record id="view_stock_request_tree" model="ir.ui.view">
         <field name="name">stock.request.tree</field>
         <field name="model">stock.request</field>
         <field name="arch" type="xml">
-            <tree string="Stock Requests" decoration-muted="state == 'cancel'" decoration-bf="message_needaction==True">
-                <field name="message_needaction" invisible="1"/>
-                <field name="name"/>
-                <field name="warehouse_id" groups="stock.group_stock_multi_locations"/>
-                <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                <field name="allow_virtual_location" invisible="1"/>
-                <field name="route_id" options="{'no_create': True}" groups="stock.group_stock_multi_locations"/>
-                <field name="product_id"/>
-                <field name="product_uom_id"
-                       options="{'no_open': True, 'no_create': True}" groups="uom.group_uom"/>
-                <field name="product_uom_qty"/>
+            <tree
+                string="Stock Requests"
+                decoration-muted="state == 'cancel'"
+                decoration-bf="message_needaction==True"
+            >
+                <field name="message_needaction" invisible="1" />
+                <field name="name" />
+                <field name="warehouse_id" groups="stock.group_stock_multi_locations" />
+                <field name="location_id" groups="stock.group_stock_multi_locations" />
+                <field name="allow_virtual_location" invisible="1" />
+                <field
+                    name="route_id"
+                    options="{'no_create': True}"
+                    groups="stock.group_stock_multi_locations"
+                />
+                <field name="product_id" />
+                <field
+                    name="product_uom_id"
+                    options="{'no_open': True, 'no_create': True}"
+                    groups="uom.group_uom"
+                />
+                <field name="product_uom_qty" />
                 <field name="qty_in_progress" />
                 <field name="qty_done" />
-                <field name="state"/>
+                <field name="state" />
             </tree>
         </field>
     </record>
-
     <record model="ir.ui.view" id="stock_request_search">
         <field name="name">stock.request.search</field>
         <field name="model">stock.request</field>
         <field name="arch" type="xml">
             <search string="Stock Requests Search">
-                <field name="name" string="Stock Requests"/>
-                <field name="warehouse_id"/>
-                <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                <field name="company_id" groups="base.group_multi_company"/>
-                <field name="product_id"/>
-                <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                <field name="name" string="Stock Requests" />
+                <field name="warehouse_id" />
+                <field name="location_id" groups="stock.group_stock_multi_locations" />
+                <field name="company_id" groups="base.group_multi_company" />
+                <field name="product_id" />
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active','=',False)]"
+                />
                 <group expand="0" string="Group By">
-                    <filter name="warehouse" string="Warehouse" domain="[]"  context="{'group_by':'warehouse_id'}"/>
-                    <filter name="location" string="Location" domain="[]" context="{'group_by':'location_id'}"/>
+                    <filter
+                        name="warehouse"
+                        string="Warehouse"
+                        domain="[]"
+                        context="{'group_by':'warehouse_id'}"
+                    />
+                    <filter
+                        name="location"
+                        string="Location"
+                        domain="[]"
+                        context="{'group_by':'location_id'}"
+                    />
                 </group>
             </search>
         </field>
     </record>
-
     <record id="view_stock_request_form" model="ir.ui.view">
         <field name="name">stock.request.form</field>
         <field name="model">stock.request</field>
         <field name="arch" type="xml">
             <form string="Stock Requests">
                 <header>
-                    <button name="action_confirm"
-                        string="Confirm" type="object"
-                        attrs="{'invisible': [('state', 'not in', ['draft'])]}"/>
-                    <button name="action_cancel" states="draft,open"
-                            type="object" string="Cancel"/>
-                    <button name="action_draft" states="cancel" type="object"
-                            string="Set to Draft"/>
-                    <button name="action_done"
-                        string="Done" type="object"
-                        attrs="{'invisible': [('state', 'not in', ['open'])]}"/>
-                    <field name="state" widget="statusbar"/>
+                    <button
+                        name="action_confirm"
+                        string="Confirm"
+                        type="object"
+                        attrs="{'invisible': [('state', 'not in', ['draft'])]}"
+                    />
+                    <button
+                        name="action_cancel"
+                        states="draft,open"
+                        type="object"
+                        string="Cancel"
+                    />
+                    <button
+                        name="action_draft"
+                        states="cancel"
+                        type="object"
+                        string="Set to Draft"
+                    />
+                    <button
+                        name="action_done"
+                        string="Done"
+                        type="object"
+                        attrs="{'invisible': [('state', 'not in', ['open'])]}"
+                    />
+                    <field name="state" widget="statusbar" />
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <field name="picking_ids" invisible="1"/>
-                        <button type="object"
+                        <field name="picking_ids" invisible="1" />
+                        <button
+                            type="object"
                             name="action_view_transfer"
                             class="oe_stat_button"
                             icon="fa-truck"
                             attrs="{'invisible': [('picking_count', '=', 0)]}"
-                                groups="stock.group_stock_user">
-                            <field name="picking_count" widget="statinfo"
-                                   string="Transfers"/>
+                            groups="stock.group_stock_user"
+                        >
+                            <field
+                                name="picking_count"
+                                widget="statinfo"
+                                string="Transfers"
+                            />
                         </button>
                     </div>
                     <div class="oe_title">
-                        <label for="name" string="Stock Request"/>
+                        <label for="name" string="Stock Request" />
                         <h1>
-                            <field name="name" readonly="1"/>
+                            <field name="name" readonly="1" />
                         </h1>
                     </div>
                     <group>
                         <group>
-                            <field name="order_id" readonly="1" groups="stock_request.group_stock_request_order"/>
-                            <field name="product_id"/>
-                            <field name="expected_date"/>
-                            <field name="picking_policy"/>
+                            <field
+                                name="order_id"
+                                readonly="1"
+                                groups="stock_request.group_stock_request_order"
+                            />
+                            <field name="product_id" />
+                            <field name="expected_date" />
+                            <field name="picking_policy" />
                         </group>
                         <group>
-                            <field name="warehouse_id" widget="selection" groups="stock.group_stock_multi_locations"/>
-                            <field name="location_id" groups="stock.group_stock_multi_locations"
-                                   domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
-                            <field name="route_id"
-                                   options="{'no_create': True}" groups="stock.group_stock_multi_locations"/>
-                            <field name="route_ids" invisible="1"/>
-                            <field name="procurement_group_id"
-                                   groups="stock.group_adv_location"/>
-                            <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
+                            <field
+                                name="warehouse_id"
+                                widget="selection"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                            <field
+                                name="location_id"
+                                groups="stock.group_stock_multi_locations"
+                                domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"
+                            />
+                            <field
+                                name="route_id"
+                                options="{'no_create': True}"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                            <field name="route_ids" invisible="1" />
+                            <field
+                                name="procurement_group_id"
+                                groups="stock.group_adv_location"
+                            />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                                options="{'no_create': True}"
+                            />
                         </group>
                         <group name="quantities">
-                            <label for="product_uom_qty"/>
+                            <label for="product_uom_qty" />
                             <div>
-                                <field name="product_uom_qty"
-                                       class="oe_inline"/>
-                                <field name="product_uom_id"
-                                       class="oe_inline"
-                                       options="{'no_open': True, 'no_create': True}"
-                                       groups="uom.group_uom"/>
+                                <field name="product_uom_qty" class="oe_inline" />
+                                <field
+                                    name="product_uom_id"
+                                    class="oe_inline"
+                                    options="{'no_open': True, 'no_create': True}"
+                                    groups="uom.group_uom"
+                                />
                             </div>
                             <field name="qty_in_progress" />
                             <field name="qty_done" />
@@ -118,26 +180,24 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="activity_ids" widget="mail_activity"/>
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="activity_ids" widget="mail_activity" />
+                    <field name="message_ids" widget="mail_thread" />
                 </div>
             </form>
         </field>
     </record>
-
     <record id="action_stock_request_form" model="ir.actions.act_window">
         <field name="name">Stock Requests</field>
         <field name="res_model">stock.request</field>
         <field name="type">ir.actions.act_window</field>
         <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_stock_request_tree"/>
+        <field name="view_id" ref="view_stock_request_tree" />
         <field name="search_view_id" ref="stock_request_search" />
         <field name="help" type="html">
-          <p class="oe_view_nocontent_create">
+            <p class="oe_view_nocontent_create">
             Click to add a Stock Request.
           </p>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_secondary_unit/report/report_deliveryslip.xml b/stock_secondary_unit/report/report_deliveryslip.xml
index b7c7ee700..8aba6e52a 100644
--- a/stock_secondary_unit/report/report_deliveryslip.xml
+++ b/stock_secondary_unit/report/report_deliveryslip.xml
@@ -1,27 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2018 Tecnativa - Sergio Teruel
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-
-    <template id="report_delivery_document" inherit_id="stock.report_delivery_document" priority="8">
-        <xpath expr='//table[@t-if="o.state!=&apos;done&apos;"]/thead/tr/th' position="after">
-            <th><strong>Secondary Qty</strong></th>
+    <template
+        id="report_delivery_document"
+        inherit_id="stock.report_delivery_document"
+        priority="8"
+    >
+        <xpath
+            expr='//table[@t-if="o.state!=&apos;done&apos;"]/thead/tr/th'
+            position="after"
+        >
+            <th>
+                <strong>Secondary Qty</strong>
+            </th>
         </xpath>
         <xpath expr="//span[@t-field='move.product_id']/.." position="after">
             <td>
-                <span t-field="move.secondary_uom_qty"/>
-                <span t-field="move.secondary_uom_id.name"/>
+                <span t-field="move.secondary_uom_qty" />
+                <span t-field="move.secondary_uom_id.name" />
             </td>
         </xpath>
-        <xpath expr='//table[@t-if="o.move_line_ids and o.state==&apos;done&apos;"]/thead/tr/th' position="after">
-            <th><strong>Secondary Qty</strong></th>
+        <xpath
+            expr='//table[@t-if="o.move_line_ids and o.state==&apos;done&apos;"]/thead/tr/th'
+            position="after"
+        >
+            <th>
+                <strong>Secondary Qty</strong>
+            </th>
         </xpath>
         <xpath expr="//span[@t-field='move_line.product_id']/.." position="after">
             <td>
-                <span t-field="move_line.secondary_uom_qty"/>
-                <span t-field="move_line.secondary_uom_id"/>
+                <span t-field="move_line.secondary_uom_qty" />
+                <span t-field="move_line.secondary_uom_id" />
             </td>
         </xpath>
     </template>
-
 </odoo>
diff --git a/stock_secondary_unit/views/product_views.xml b/stock_secondary_unit/views/product_views.xml
index 28441445a..0a1196b23 100644
--- a/stock_secondary_unit/views/product_views.xml
+++ b/stock_secondary_unit/views/product_views.xml
@@ -1,86 +1,111 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2018 Tecnativa - Sergio Teruel
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record id="view_template_property_form" model="ir.ui.view">
         <field name="name">Product template Secondary Unit</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="stock.view_template_property_form"/>
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]"/>
+        <field name="inherit_id" ref="stock.view_template_property_form" />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath expr="//group[@name='inventory']" position="inside">
                 <group string="Secondary unit">
-                    <field name="stock_secondary_uom_id"
-                           domain="[('product_tmpl_id', '=', id)]"
-                           options="{'no_create': True}"/>
+                    <field
+                        name="stock_secondary_uom_id"
+                        domain="[('product_tmpl_id', '=', id)]"
+                        options="{'no_create': True}"
+                    />
                 </group>
             </xpath>
         </field>
     </record>
-
     <record id="product_template_form_view_procurement_button" model="ir.ui.view">
         <field name="model">product.template</field>
-        <field name="inherit_id"
-               ref="stock.product_template_form_view_procurement_button"/>
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]"/>
+        <field
+            name="inherit_id"
+            ref="stock.product_template_form_view_procurement_button"
+        />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath expr="//button[@name='action_open_quants']" position="after">
-                <button type="object"
+                <button
+                    type="object"
                     name="action_open_quants"
                     attrs="{'invisible':[('type', '!=', 'product')]}"
-                    class="oe_stat_button" icon="fa-building-o">
+                    class="oe_stat_button"
+                    icon="fa-building-o"
+                >
                     <div class="o_form_field o_stat_info">
-                        <span class="o_stat_value"><field name="secondary_unit_qty_available" widget="statinfo" nolabel="1"/></span>
-                        <span class="o_stat_text"><field name="stock_secondary_uom_id"/></span>
+                        <span class="o_stat_value">
+                            <field
+                                name="secondary_unit_qty_available"
+                                widget="statinfo"
+                                nolabel="1"
+                            />
+                        </span>
+                        <span class="o_stat_text">
+                            <field name="stock_secondary_uom_id" />
+                        </span>
                     </div>
                 </button>
             </xpath>
         </field>
     </record>
-
     <record id="product_form_view_procurement_button" model="ir.ui.view">
         <field name="model">product.product</field>
-        <field name="inherit_id"
-               ref="stock.product_form_view_procurement_button"/>
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]"/>
+        <field name="inherit_id" ref="stock.product_form_view_procurement_button" />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath expr="//button[@name='action_open_quants']" position="after">
-                <button type="object"
+                <button
+                    type="object"
                     name="action_open_quants"
                     attrs="{'invisible':[('type', '!=', 'product')]}"
-                    class="oe_stat_button" icon="fa-building-o">
+                    class="oe_stat_button"
+                    icon="fa-building-o"
+                >
                     <div class="o_form_field o_stat_info">
-                        <span class="o_stat_value"><field name="secondary_unit_qty_available" widget="statinfo" nolabel="1"/></span>
-                        <span class="o_stat_text"><field name="stock_secondary_uom_id"/></span>
+                        <span class="o_stat_value">
+                            <field
+                                name="secondary_unit_qty_available"
+                                widget="statinfo"
+                                nolabel="1"
+                            />
+                        </span>
+                        <span class="o_stat_text">
+                            <field name="stock_secondary_uom_id" />
+                        </span>
                     </div>
                 </button>
             </xpath>
         </field>
     </record>
-
     <record id="product_template_tree_view" model="ir.ui.view">
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="product.product_template_tree_view"/>
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]"/>
+        <field name="inherit_id" ref="product.product_template_tree_view" />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='uom_id']" position="after">
-                <field name="secondary_unit_qty_available"/>
-                <field name="stock_secondary_uom_id" options="{'no_open': True, 'no_create': True}"/>
+                <field name="secondary_unit_qty_available" />
+                <field
+                    name="stock_secondary_uom_id"
+                    options="{'no_open': True, 'no_create': True}"
+                />
             </xpath>
         </field>
     </record>
-
     <record id="product_product_tree_view" model="ir.ui.view">
         <field name="model">product.product</field>
-        <field name="inherit_id" ref="product.product_product_tree_view"/>
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]"/>
+        <field name="inherit_id" ref="product.product_product_tree_view" />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='uom_id']" position="after">
-                <field name="secondary_unit_qty_available"/>
-                <field name="stock_secondary_uom_id" options="{'no_open': True, 'no_create': True}"/>
+                <field name="secondary_unit_qty_available" />
+                <field
+                    name="stock_secondary_uom_id"
+                    options="{'no_open': True, 'no_create': True}"
+                />
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_secondary_unit/views/stock_move_views.xml b/stock_secondary_unit/views/stock_move_views.xml
index d2adcf37c..9c097ba0b 100644
--- a/stock_secondary_unit/views/stock_move_views.xml
+++ b/stock_secondary_unit/views/stock_move_views.xml
@@ -1,36 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2018 Tecnativa - Sergio Teruel
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record id="view_stock_move_line_operation_tree" model="ir.ui.view">
         <field name="name">Stock Move Secondary Unit</field>
         <field name="model">stock.move.line</field>
-        <field name="inherit_id" ref="stock.view_stock_move_line_operation_tree"/>
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]"/>
+        <field name="inherit_id" ref="stock.view_stock_move_line_operation_tree" />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <field name="product_uom_qty" position="before">
-                <field name="secondary_uom_qty"/>
-                <field name="secondary_uom_id"
-                       domain="[('product_tmpl_id.product_variant_ids', 'in', [product_id])]"
-                       options="{'no_create': True}"/>
+                <field name="secondary_uom_qty" />
+                <field
+                    name="secondary_uom_id"
+                    domain="[('product_tmpl_id.product_variant_ids', 'in', [product_id])]"
+                    options="{'no_create': True}"
+                />
             </field>
         </field>
     </record>
-
     <record id="view_stock_move_line_detailed_operation_tree" model="ir.ui.view">
         <field name="name">stock.move.line.operations.tree</field>
         <field name="model">stock.move.line</field>
-        <field name="inherit_id" ref="stock.view_stock_move_line_detailed_operation_tree"/>
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]"/>
+        <field
+            name="inherit_id"
+            ref="stock.view_stock_move_line_detailed_operation_tree"
+        />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
             <field name="product_uom_qty" position="before">
-                <field name="secondary_uom_qty"/>
-                <field name="secondary_uom_id"
-                       domain="[('product_tmpl_id.product_variant_ids', 'in', [product_id])]"
-                       options="{'no_create': True}"/>
+                <field name="secondary_uom_qty" />
+                <field
+                    name="secondary_uom_id"
+                    domain="[('product_tmpl_id.product_variant_ids', 'in', [product_id])]"
+                    options="{'no_create': True}"
+                />
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_secondary_unit/views/stock_picking_views.xml b/stock_secondary_unit/views/stock_picking_views.xml
index 08c9b926e..0b913b24b 100644
--- a/stock_secondary_unit/views/stock_picking_views.xml
+++ b/stock_secondary_unit/views/stock_picking_views.xml
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2018 Tecnativa - Sergio Teruel
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record id="view_picking_form" model="ir.ui.view">
         <field name="name">Stock Picking Secondary Unit</field>
         <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form"/>
-        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]"/>
+        <field name="inherit_id" ref="stock.view_picking_form" />
+        <field name="groups_id" eval="[(4, ref('uom.group_uom'))]" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='move_ids_without_package']/tree/field[@name='product_uom_qty']" position="before">
-                <field name="secondary_uom_qty"/>
-                <field name="secondary_uom_id"
-                       domain="[('product_tmpl_id.product_variant_ids', 'in', [product_id])]"
-                       options="{'no_create': True}"/>
+            <xpath
+                expr="//field[@name='move_ids_without_package']/tree/field[@name='product_uom_qty']"
+                position="before"
+            >
+                <field name="secondary_uom_qty" />
+                <field
+                    name="secondary_uom_id"
+                    domain="[('product_tmpl_id.product_variant_ids', 'in', [product_id])]"
+                    options="{'no_create': True}"
+                />
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/stock_warehouse_calendar/views/stock_warehouse_views.xml b/stock_warehouse_calendar/views/stock_warehouse_views.xml
index 7f07fa9e0..168e995a5 100644
--- a/stock_warehouse_calendar/views/stock_warehouse_views.xml
+++ b/stock_warehouse_calendar/views/stock_warehouse_views.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2018 2018-19 ForgeFlow S.L. (https://www.forgeflow.com)
      License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -->
 <odoo>
-
     <record id="view_warehouse" model="ir.ui.view">
         <field name="name">stock.warehouse</field>
         <field name="model">stock.warehouse</field>
-        <field name="inherit_id" ref="stock.view_warehouse"/>
+        <field name="inherit_id" ref="stock.view_warehouse" />
         <field name="arch" type="xml">
             <field name="company_id" position="after">
-                <field name="calendar_id" options="{'no_create': True}"/>
+                <field name="calendar_id" options="{'no_create': True}" />
             </field>
         </field>
     </record>
diff --git a/stock_warehouse_orderpoint_stock_info/views/stock_warehouse_orderpoint_view.xml b/stock_warehouse_orderpoint_stock_info/views/stock_warehouse_orderpoint_view.xml
index 91f313cc8..b87a7dc98 100644
--- a/stock_warehouse_orderpoint_stock_info/views/stock_warehouse_orderpoint_view.xml
+++ b/stock_warehouse_orderpoint_stock_info/views/stock_warehouse_orderpoint_view.xml
@@ -1,54 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-        <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.tree</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="inherit_id" ref="stock.view_warehouse_orderpoint_tree" />
-            <field name="arch" type="xml">
-                <field name="product_id" position="after">
-                    <field name="product_category"/>
-                </field>
-                <field name="product_max_qty" position="after">
-                    <field name="product_location_qty" />
-                    <field name="incoming_location_qty" />
-                    <field name="outgoing_location_qty" />
-                    <field name="virtual_location_qty" />
-                </field>
+    <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
+        <field name="name">stock.warehouse.orderpoint.tree</field>
+        <field name="model">stock.warehouse.orderpoint</field>
+        <field name="inherit_id" ref="stock.view_warehouse_orderpoint_tree" />
+        <field name="arch" type="xml">
+            <field name="product_id" position="after">
+                <field name="product_category" />
             </field>
-        </record>
-
-        <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.form</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="inherit_id" ref="stock.view_warehouse_orderpoint_form" />
-            <field name="arch" type="xml">
-                <field name="qty_multiple" position="after">
-                    <field name="product_location_qty" />
-                    <field name="incoming_location_qty" />
-                    <field name="outgoing_location_qty" />
-                    <field name="virtual_location_qty" />
-                </field>
+            <field name="product_max_qty" position="after">
+                <field name="product_location_qty" />
+                <field name="incoming_location_qty" />
+                <field name="outgoing_location_qty" />
+                <field name="virtual_location_qty" />
             </field>
-        </record>
-
-        <record id="warehouse_orderpoint_search" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.search</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="inherit_id" ref="stock.warehouse_orderpoint_search" />
-            <field name="arch" type="xml">
-                <field name="product_id" position="after">
-                    <field name="product_category" filter_domain="[('product_category','child_of',self)]"/>
-                </field>
-                <xpath expr="//group[1]" position="inside">
-                    <filter name="product"
-                            string="Product"
-                            domain="[]"
-                            context="{'group_by':'product_id'}"/>
-                    <filter name="product_category"
-                            string="Product Category"
-                            domain="[]"
-                            context="{'group_by':'product_category'}"/>
-                </xpath>
+        </field>
+    </record>
+    <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
+        <field name="name">stock.warehouse.orderpoint.form</field>
+        <field name="model">stock.warehouse.orderpoint</field>
+        <field name="inherit_id" ref="stock.view_warehouse_orderpoint_form" />
+        <field name="arch" type="xml">
+            <field name="qty_multiple" position="after">
+                <field name="product_location_qty" />
+                <field name="incoming_location_qty" />
+                <field name="outgoing_location_qty" />
+                <field name="virtual_location_qty" />
             </field>
-        </record>
+        </field>
+    </record>
+    <record id="warehouse_orderpoint_search" model="ir.ui.view">
+        <field name="name">stock.warehouse.orderpoint.search</field>
+        <field name="model">stock.warehouse.orderpoint</field>
+        <field name="inherit_id" ref="stock.warehouse_orderpoint_search" />
+        <field name="arch" type="xml">
+            <field name="product_id" position="after">
+                <field
+                    name="product_category"
+                    filter_domain="[('product_category','child_of',self)]"
+                />
+            </field>
+            <xpath expr="//group[1]" position="inside">
+                <filter
+                    name="product"
+                    string="Product"
+                    domain="[]"
+                    context="{'group_by':'product_id'}"
+                />
+                <filter
+                    name="product_category"
+                    string="Product Category"
+                    domain="[]"
+                    context="{'group_by':'product_category'}"
+                />
+            </xpath>
+        </field>
+    </record>
 </odoo>
diff --git a/stock_warehouse_orderpoint_stock_info_unreserved/views/stock_warehouse_orderpoint_view.xml b/stock_warehouse_orderpoint_stock_info_unreserved/views/stock_warehouse_orderpoint_view.xml
index 61e73aa1b..e67720472 100644
--- a/stock_warehouse_orderpoint_stock_info_unreserved/views/stock_warehouse_orderpoint_view.xml
+++ b/stock_warehouse_orderpoint_stock_info_unreserved/views/stock_warehouse_orderpoint_view.xml
@@ -1,26 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-        <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.tree</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="inherit_id"
-                   ref="stock_warehouse_orderpoint_stock_info.view_warehouse_orderpoint_tree" />
-            <field name="arch" type="xml">
-                <field name="product_location_qty" position="after">
-                    <field name="product_location_qty_available_not_res" />
-                </field>
+    <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
+        <field name="name">stock.warehouse.orderpoint.tree</field>
+        <field name="model">stock.warehouse.orderpoint</field>
+        <field
+            name="inherit_id"
+            ref="stock_warehouse_orderpoint_stock_info.view_warehouse_orderpoint_tree"
+        />
+        <field name="arch" type="xml">
+            <field name="product_location_qty" position="after">
+                <field name="product_location_qty_available_not_res" />
             </field>
-        </record>
-
-        <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.form</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="inherit_id"
-                   ref="stock_warehouse_orderpoint_stock_info.view_warehouse_orderpoint_form" />
-            <field name="arch" type="xml">
-                <field name="product_location_qty" position="after">
-                    <field name="product_location_qty_available_not_res" />
-                </field>
+        </field>
+    </record>
+    <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
+        <field name="name">stock.warehouse.orderpoint.form</field>
+        <field name="model">stock.warehouse.orderpoint</field>
+        <field
+            name="inherit_id"
+            ref="stock_warehouse_orderpoint_stock_info.view_warehouse_orderpoint_form"
+        />
+        <field name="arch" type="xml">
+            <field name="product_location_qty" position="after">
+                <field name="product_location_qty_available_not_res" />
             </field>
-        </record>
+        </field>
+    </record>
 </odoo>