Merge PR #630 into 13.0

Signed-off-by LoisRForgeFlow

.copier-answers.yml

@@ -0,0 +1,13 @@
+# Do NOT update manually; changes here will be overwritten by Copier
+_commit: v1.1.3
+_src_path: https://github.com/OCA/oca-addons-repo-template.git
+dependency_installation_mode: OCA
+generate_requirements_txt: true
+include_wkhtmltopdf: true
+odoo_version: 13.0
+rebel_module_groups: []
+repo_description: Odoo modules related to Manufacturing
+repo_name: Odoo Manufacturing Modules
+repo_slug: manufacture
+travis_apt_packages: []
+travis_apt_sources: []

.github/workflows/pre-commit.yml

@@ -0,0 +1,13 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: pre-commit/action@v2.0.0

.gitignore

@@ -1,6 +1,8 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+/.venv
+/.pytest_cache
 
 # C extensions
 *.so
@@ -21,6 +23,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+*.eggs
 
 # Installer logs
 pip-log.txt
@@ -40,6 +43,19 @@ coverage.xml
 # Pycharm
 .idea
 
+# Eclipse
+.settings
+
+# Visual Studio cache/options directory
+.vs/
+.vscode
+
+# OSX Files
+.DS_Store
+
+# Django stuff:
+*.log
+
 # Mr Developer
 .mr.developer.cfg
 .project
@@ -54,3 +70,6 @@ docs/_build/
 # Backup files
 *~
 *.swp
+
+# OCA rules
+!static/lib/

.pre-commit-config.yaml

@@ -1,7 +1,11 @@
 exclude: |
   (?x)
+  # NOT INSTALLABLE ADDONS
+  # END NOT INSTALLABLE ADDONS
   # Files and folders generated by bots, to avoid loops
   ^setup/|/static/description/index\.html$|
+  # We don't want to mess with tool-generated files
+  .svg$|
   # Maybe reactivate this when all README files include prettier ignore tags?
   ^README\.md$|
   # Library files can have extraneous formatting (even minimized)
@@ -14,25 +18,41 @@ default_language_version:
   python: python3
   node: "14.13.0"
 repos:
+  - repo: local
+    hooks:
+      # These files are most likely copier diff rejection junks; if found,
+      # review them manually, fix the problem (if needed) and remove them
+      - id: forbidden-files
+        name: forbidden files
+        entry: found forbidden files; remove them
+        language: fail
+        files: "\\.rej$"
+  - repo: https://github.com/oca/maintainer-tools
+    rev: ab1d7f6
+    hooks:
+      # update the NOT INSTALLABLE ADDONS section above
+      - id: oca-update-pre-commit-excluded-addons
+      - id: oca-fix-manifest-website
+        args: ["https://github.com/OCA/manufacture"]
+  - repo: https://github.com/myint/autoflake
+    rev: v1.4
+    hooks:
+      - id: autoflake
+        args: ["-i", "--ignore-init-module-imports"]
   - repo: https://github.com/psf/black
     rev: 19.10b0
     hooks:
       - id: black
-  - repo: https://github.com/prettier/pre-commit
-    rev: "v1.19.1"
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v1.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
+        name: prettier (with plugin-xml)
+        entry: prettier --write --list-different
         additional_dependencies:
           - "prettier@1.19.1"
           - "@prettier/plugin-xml@0.7.2"
-        files: \.xml$
+        files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
   - repo: https://github.com/pre-commit/mirrors-eslint
     rev: v6.8.0
     hooks:
@@ -63,6 +83,21 @@ repos:
       - id: check-xml
       - id: mixed-line-ending
         args: ["--fix=lf"]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v1.26.2
+    hooks:
+      - id: pyupgrade
+        args: ["--keep-percent-format"]
+  - 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
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.7.9
     hooks:
@@ -80,24 +115,14 @@ repos:
     hooks:
       - id: pylint
         name: pylint with optional checks
-        args: ["--rcfile=.pylintrc", "--exit-zero"]
+        args:
+          - --rcfile=.pylintrc
+          - --exit-zero
         verbose: true
-        additional_dependencies: ["pylint-odoo==3.5.0"]
+        additional_dependencies: &pylint_deps
+          - pylint-odoo==3.5.0
       - id: pylint
         name: pylint with mandatory checks
-        args: ["--rcfile=.pylintrc-mandatory"]
-        additional_dependencies: ["pylint-odoo==3.5.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
+        args:
+          - --rcfile=.pylintrc-mandatory
+        additional_dependencies: *pylint_deps

.prettierrc.yml

@@ -5,4 +5,4 @@ printWidth: 88
 proseWrap: always
 semi: true
 trailingComma: "es5"
-xmlWhitespaceSensitivity: "ignore"
+xmlWhitespaceSensitivity: "strict"

.pylintrc

@@ -46,8 +46,6 @@ enable=anomalous-backslash-in-string,
     method-inverse,
     method-required-super,
     method-search,
-    missing-import-error,
-    missing-manifest-dependency,
     openerp-exception-warning,
     pointless-statement,
     pointless-string-statement,
@@ -73,6 +71,7 @@ enable=anomalous-backslash-in-string,
     deprecated-module,
     file-not-used,
     invalid-commit,
+    missing-manifest-dependency,
     missing-newline-extrafiles,
     missing-readme,
     no-utf8-coding-comment,
@@ -82,6 +81,7 @@ enable=anomalous-backslash-in-string,
     too-complex,
     unnecessary-utf8-coding-comment
 
+
 [REPORTS]
 msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
 output-format=colorized

.pylintrc-mandatory

@@ -39,8 +39,6 @@ enable=anomalous-backslash-in-string,
     method-inverse,
     method-required-super,
     method-search,
-    missing-import-error,
-    missing-manifest-dependency,
     openerp-exception-warning,
     pointless-statement,
     pointless-string-statement,

.travis.yml

@@ -14,27 +14,20 @@ addons:
       - expect-dev # provides unbuffer utility
 
 stages:
-  - linting
   - test
 
 jobs:
   include:
-    - stage: linting
-      name: "pre-commit"
-      before_install:
-      install: pip install pre-commit
-      script: pre-commit run --all --show-diff-on-failure --verbose --color always
-      after_success:
     - stage: test
       env:
-        - TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1"
+        - TESTS=1 ODOO_REPO="odoo/odoo" MAKEPOT="1"
     - stage: test
       env:
-        - TESTS="1" ODOO_REPO="OCA/OCB"
-
+        - TESTS=1 ODOO_REPO="OCA/OCB"
 env:
   global:
     - VERSION="13.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0"
+    - WKHTMLTOPDF_VERSION="0.12.5"
 
 install:
   - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git

CONTRIBUTING.md

@@ -0,0 +1,10 @@
+# OCA Guidelines
+
+Please follow the official guide from the
+[OCA Guidelines page](https://odoo-community.org/page/contributing).
+
+## Project Specific Guidelines
+
+<!-- /!\ do not modify above this line -->
+
+This project does not have specific coding guidelines.

LICENSE

@@ -1,7 +1,7 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
+                    GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -633,8 +633,8 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,15 +1,36 @@
 [![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/129/13.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-manufacture-129)
-[![Build Status](https://travis-ci.org/OCA/manufacture.svg?branch=13.0)](https://travis-ci.org/OCA/manufacture)
+[![Build Status](https://travis-ci.com/OCA/manufacture.svg?branch=13.0)](https://travis-ci.com/OCA/manufacture)
 [![codecov](https://codecov.io/gh/OCA/manufacture/branch/13.0/graph/badge.svg)](https://codecov.io/gh/OCA/manufacture)
+[![Translation Status](https://translation.odoo-community.org/widgets/manufacture-13-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/manufacture-13-0/?utm_source=widget)
 
-Odoo Manufacturing Modules
-==========================
+<!-- /!\ do not modify above this line -->
+
+# Odoo Manufacturing Modules
 
 Odoo modules related to Manufacturing
 
+<!-- /!\ do not modify below this line -->
 
+<!-- prettier-ignore-start -->
 
-Translation status
-------------------
+[//]: # (addons)
 
-[![Transifex Status](https://www.transifex.com/projects/p/OCA-manufacture-13-0/chart/image_png)](https://www.transifex.com/projects/p/OCA-manufacture-13-0)
+This part will be replaced when running the oca-gen-addons-table script from OCA/maintainer-tools.
+
+[//]: # (end addons)
+
+<!-- prettier-ignore-end -->
+
+## Licenses
+
+This repository is licensed under [AGPL-3.0](LICENSE).
+
+However, each module can have a totally different license, as long as they adhere to OCA
+policy. Consult each module's `__manifest__.py` file, which contains a `license` key
+that explains its license.
+
+----
+
+OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit
+organization whose mission is to support the collaborative development of Odoo features
+and promote its widespread use.

base_repair/__manifest__.py

@@ -11,7 +11,7 @@
     "author": "Escodoo, Agile Business Group, Odoo Community Association (OCA)",
     "maintainers": ["marcelsavegnago"],
     "images": ["static/description/banner.png"],
-    "website": "https://github.com/oca/manufacture",
+    "website": "https://github.com/OCA/manufacture",
     "category": "Manufacturing",
     "depends": ["repair"],
     "data": ["views/repair_order.xml"],

mrp_planned_order_matrix/__manifest__.py

@@ -5,7 +5,7 @@
     "summary": "Allows to create fixed planned orders on a grid view.",
     "version": "13.0.1.0.0",
     "author": "ForgeFlow, Odoo Community Association (OCA)",
-    "website": "https://github.com/OCA/stock-logistics-warehouse",
+    "website": "https://github.com/OCA/manufacture",
     "category": "Warehouse Management",
     "depends": ["mrp_multi_level", "web_widget_x2many_2d_matrix", "date_range"],
     "data": ["wizards/mrp_planned_order_wizard_view.xml"],

mrp_production_grouped_by_product/__manifest__.py

@@ -8,7 +8,7 @@
     "version": "13.0.1.0.0",
     "category": "MRP",
     "author": "Tecnativa, " "Odoo Community Association (OCA)",
-    "website": "https://github.com/oca/manufacture",
+    "website": "https://github.com/OCA/manufacture",
     "license": "AGPL-3",
     "depends": ["mrp"],
     "data": ["views/stock_picking_type_views.xml"],

mrp_sale_info/__manifest__.py

@@ -7,7 +7,7 @@
     "summary": "Adds sale information to Manufacturing models",
     "version": "13.0.1.0.0",
     "category": "Manufacturing",
-    "website": "https://github.com/oca/manufacture",
+    "website": "https://github.com/OCA/manufacture",
     "author": "AvanzOSC, " "Tecnativa, " "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "application": False,

mrp_warehouse_calendar/__manifest__.py

@@ -6,7 +6,7 @@
     "summary": "Considers the warehouse calendars in manufacturing",
     "version": "13.0.1.0.0",
     "license": "LGPL-3",
-    "website": "https://github.com/manufacture",
+    "website": "https://github.com/OCA/manufacture",
     "author": "ForgeFlow, Odoo Community Association (OCA)",
     "category": "Manufacturing",
     "depends": ["mrp", "stock_warehouse_calendar"],