Merge branch '14.0' into 14.0-imp-stock_buffer_route

OCA · Feb 28, 2024 · f9d4948 · f9d4948
2 parents b6e8f17 + 454fa90
commit f9d4948
Show file tree

Hide file tree

Showing 108 changed files with 7,189 additions and 578 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,8 +1,8 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.14.2
+_commit: v1.19.1
 _src_path: gh:oca/oca-addons-repo-template
-ci: Github
-dependency_installation_mode: PIP
+ci: GitHub
+convert_readme_fragments_to_markdown: false
 generate_requirements_txt: true
 github_check_license: true
 github_ci_extra_env: {}
@@ -11,6 +11,7 @@ github_enable_makepot: true
 github_enable_stale_action: true
 github_enforce_dev_status_compatibility: true
 include_wkhtmltopdf: false
+odoo_test_flavor: Both
 odoo_version: 14.0
 org_name: Odoo Community Association (OCA)
 org_slug: OCA
@@ -20,6 +21,6 @@ repo_description: Demand Driven Material Requirements Planning implementation fo
 repo_name: DDMRP
 repo_slug: ddmrp
 repo_website: https://github.com/OCA/ddmrp
-travis_apt_packages: []
-travis_apt_sources: []
+use_pyproject_toml: false
+use_ruff: false
 
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -22,6 +22,7 @@ globals:
   odoo: readonly
   openerp: readonly
   owl: readonly
+  luxon: 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

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -13,8 +13,10 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v2
+        with:
+          python-version: "3.11"
       - name: Get python version
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
       - uses: actions/cache@v1
@@ -25,6 +27,15 @@ jobs:
         run: pip install pre-commit
       - name: Run pre-commit
         run: pre-commit run --all-files --show-diff-on-failure --color=always
+        env:
+          # Consider valid a PR that changes README fragments but doesn't
+          # change the README.rst file itself. It's not really a problem
+          # because the bot will update it anyway after merge. This way, we
+          # lower the barrier for functional contributors that want to fix the
+          # readme fragments, while still letting developers get README
+          # auto-generated (which also helps functionals when using runboat).
+          # DOCS https://pre-commit.com/#temporarily-disabling-hooks
+          SKIP: oca-gen-addon-readme
       - name: Check that all files generated by pre-commit are in git
         run: |
           newfiles="$(git ls-files --others --exclude-from=.gitignore)"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Detect unreleased dependencies
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: |
           for reqfile in requirements.txt test-requirements.txt ; do
               if [ -f ${reqfile} ] ; then
@@ -28,18 +28,18 @@ jobs:
               fi
           done
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container: ${{ matrix.container }}
     name: ${{ matrix.name }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
-            makepot: "true"
             name: test with Odoo
           - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
             name: test with OCB
+            makepot: "true"
     services:
       postgres:
         image: postgres:9.6
@@ -50,7 +50,7 @@ jobs:
         ports:
           - 5432:5432
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
       - name: Install addons and dependencies

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ __pycache__/
 *.py[cod]
 /.venv
 /.pytest_cache
+/.ruff_cache
 
 # C extensions
 *.so

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,6 +12,10 @@ exclude: |
   /static/(src/)?lib/|
   # Repos using Sphinx to generate docs don't need prettying
   ^docs/_templates/.*\.html$|
+  # Don't bother non-technical authors with formatting issues in docs
+  readme/.*\.(rst|md)$|
+  # Ignore build and dist directories in addons
+  /build/|/dist/|
   # You don't usually want a bot to modify your legal texts
   (LICENSE.*|COPYING.*)
 default_language_version:
@@ -33,12 +37,28 @@ repos:
         language: fail
         files: '[a-zA-Z0-9_]*/i18n/en\.po$'
   - repo: https://github.com/oca/maintainer-tools
-    rev: ab1d7f6
+    rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
     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/ddmrp"]
+      - id: oca-gen-addon-readme
+        args:
+          - --addons-dir=.
+          - --branch=14.0
+          - --org-name=OCA
+          - --repo-name=ddmrp
+          - --if-source-changed
+          - --keep-source-digest
+  - repo: https://github.com/OCA/odoo-pre-commit-hooks
+    rev: v0.0.25
+    hooks:
+      - id: oca-checks-odoo-module
+        # While https://github.com/OCA/oca-addons-repo-template/issues/233
+        # is not fixed.
+        args: ["--disable=xml-view-dangerous-replace-low-priority"]
+      - id: oca-checks-po
   - repo: https://github.com/myint/autoflake
     rev: v1.4
     hooks:

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 
 [![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/ddmrp&target_branch=14.0)
-[![Build Status](https://travis-ci.com/OCA/ddmrp.svg?branch=14.0)](https://travis-ci.com/OCA/ddmrp)
+[![Pre-commit Status](https://github.com/OCA/ddmrp/actions/workflows/pre-commit.yml/badge.svg?branch=14.0)](https://github.com/OCA/ddmrp/actions/workflows/pre-commit.yml?query=branch%3A14.0)
+[![Build Status](https://github.com/OCA/ddmrp/actions/workflows/test.yml/badge.svg?branch=14.0)](https://github.com/OCA/ddmrp/actions/workflows/test.yml?query=branch%3A14.0)
 [![codecov](https://codecov.io/gh/OCA/ddmrp/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/ddmrp)
 [![Translation Status](https://translation.odoo-community.org/widgets/ddmrp-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/ddmrp-14-0/?utm_source=widget)
 
@@ -20,19 +21,19 @@ Available addons
 ----------------
 addon | version | maintainers | summary
 --- | --- | --- | ---
-[ddmrp](ddmrp/) | 14.0.1.18.4 | [![JordiBForgeFlow](https://github.com/JordiBForgeFlow.png?size=30px)](https://github.com/JordiBForgeFlow) [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Demand Driven Material Requirements Planning
-[ddmrp_adjustment](ddmrp_adjustment/) | 14.0.1.1.0 | [![JordiBForgeFlow](https://github.com/JordiBForgeFlow.png?size=30px)](https://github.com/JordiBForgeFlow) [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Allow to apply factor adjustments to buffers.
+[ddmrp](ddmrp/) | 14.0.1.23.1 | [![JordiBForgeFlow](https://github.com/JordiBForgeFlow.png?size=30px)](https://github.com/JordiBForgeFlow) [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Demand Driven Material Requirements Planning
+[ddmrp_adjustment](ddmrp_adjustment/) | 14.0.1.2.0 | [![JordiBForgeFlow](https://github.com/JordiBForgeFlow.png?size=30px)](https://github.com/JordiBForgeFlow) [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Allow to apply factor adjustments to buffers.
 [ddmrp_chatter](ddmrp_chatter/) | 14.0.1.0.0 |  | Adds chatter and activities to stock buffers.
 [ddmrp_coverage_days](ddmrp_coverage_days/) | 14.0.1.2.0 |  | Implements Coverage Days.
 [ddmrp_cron_actions_as_job](ddmrp_cron_actions_as_job/) | 14.0.1.0.0 |  | Run DDMRP Buffer Calculation as jobs
 [ddmrp_exclude_moves_adu_calc](ddmrp_exclude_moves_adu_calc/) | 14.0.1.0.0 | [![JordiBForgeFlow](https://github.com/JordiBForgeFlow.png?size=30px)](https://github.com/JordiBForgeFlow) [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Define additional rules to exclude certain moves from ADU calculation
-[ddmrp_history](ddmrp_history/) | 14.0.1.1.0 | [![JordiBForgeFlow](https://github.com/JordiBForgeFlow.png?size=30px)](https://github.com/JordiBForgeFlow) [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Allow to store historical data of DDMRP buffers.
+[ddmrp_history](ddmrp_history/) | 14.0.1.2.0 | [![JordiBForgeFlow](https://github.com/JordiBForgeFlow.png?size=30px)](https://github.com/JordiBForgeFlow) [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Allow to store historical data of DDMRP buffers.
 [ddmrp_packaging](ddmrp_packaging/) | 14.0.1.1.0 |  | DDMRP integration with packaging
-[ddmrp_product_replace](ddmrp_product_replace/) | 14.0.1.0.2 | [![JordiBForgeFlow](https://github.com/JordiBForgeFlow.png?size=30px)](https://github.com/JordiBForgeFlow) [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Provides a assisting tool for product replacement.
+[ddmrp_product_replace](ddmrp_product_replace/) | 14.0.1.2.0 | [![JordiBForgeFlow](https://github.com/JordiBForgeFlow.png?size=30px)](https://github.com/JordiBForgeFlow) [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Provides a assisting tool for product replacement.
 [ddmrp_purchase_hide_onhand_status](ddmrp_purchase_hide_onhand_status/) | 14.0.1.0.0 | [![TDu](https://github.com/TDu.png?size=30px)](https://github.com/TDu) | Replace purchase onhand status with smart button.
-[ddmrp_warning](ddmrp_warning/) | 14.0.1.2.1 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Adds configuration warnings on stock buffers.
-[stock_buffer_capacity_limit](stock_buffer_capacity_limit/) | 14.0.1.0.0 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Ensures that the limits of storage are never surpassed
-[stock_buffer_route](stock_buffer_route/) | 14.0.1.2.1 |  | Allows to force a route to be used when procuring from Stock Buffers
+[ddmrp_warning](ddmrp_warning/) | 14.0.1.4.0 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Adds configuration warnings on stock buffers.
+[stock_buffer_capacity_limit](stock_buffer_capacity_limit/) | 14.0.1.1.0 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Ensures that the limits of storage are never surpassed
+[stock_buffer_route](stock_buffer_route/) | 14.0.1.3.0 |  | Allows to force a route to be used when procuring from Stock Buffers
 [stock_buffer_sales_analysis](stock_buffer_sales_analysis/) | 14.0.1.0.0 |  | Allows to access the Sales Analysis from Stock Buffers
 
 [//]: # (end addons)

diff --git a/ddmrp/README.rst b/ddmrp/README.rst
@@ -7,7 +7,7 @@ DDMRP
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:74bf548cd863fc5b541716caaacd7c4929c727a144d3c7b2d2d53218eba2eec0
+   !! source digest: sha256:72c250aba14c937599815388cf7f0f26fa7cf6dcc72bd42a82cbd8bfc1d39efb
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/ddmrp/__manifest__.py b/ddmrp/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "DDMRP",
     "summary": "Demand Driven Material Requirements Planning",
-    "version": "14.0.1.18.4",
+    "version": "14.0.1.23.1",
     "license": "LGPL-3",
     "development_status": "Beta",
     "author": "ForgeFlow, " "Odoo Community Association (OCA)",
@@ -14,7 +14,6 @@
     "category": "Warehouse",
     "depends": [
         "purchase_stock",
-        "mrp_bom_location",
         "stock_demand_estimate",
         "web_widget_bokeh_chart",
         "mrp_multi_level",
@@ -49,7 +48,9 @@
         "views/ddmrp_assets_backend.xml",
         "report/mrp_report_bom_structure.xml",
         "data/ir_cron.xml",
+        "wizards/ddmrp_duplicate_buffer.xml",
         "wizards/ddmrp_run_view.xml",
+        "wizards/mrp_bom_change_location.xml",
         "wizards/res_config_settings_views.xml",
     ],
     "demo": [

diff --git a/ddmrp/data/product_adu_calculation_method_data.xml b/ddmrp/data/product_adu_calculation_method_data.xml
@@ -19,4 +19,13 @@
         <field name="source_future">estimates</field>
         <field name="horizon_future">120</field>
     </record>
+    <record
+        id="adu_calculation_method_future_120_estimates_mrp"
+        model="product.adu.calculation.method"
+    >
+        <field name="name">Future (Direct + Indirect)(120 days)</field>
+        <field name="method">future</field>
+        <field name="source_future">estimates_mrp</field>
+        <field name="horizon_future">120</field>
+    </record>
 </odoo>
diff --git a/ddmrp/demo/mrp_bom_demo.xml b/ddmrp/demo/mrp_bom_demo.xml
@@ -4,38 +4,33 @@
     <record id="mrp_bom_fp01" model="mrp.bom">
         <field name="product_tmpl_id" ref="product_product_fp01_product_template" />
         <field name="product_uom_id" ref="uom.product_uom_unit" />
-        <field name="location_id" ref="stock.stock_location_stock" />
         <field name="sequence">5</field>
     </record>
     <record id="mrp_bom_fp01_line_as01" model="mrp.bom.line">
         <field name="product_id" ref="product_product_as01" />
         <field name="product_qty">1</field>
         <field name="product_uom_id" ref="uom.product_uom_unit" />
-        <field name="location_id" ref="stock.stock_location_stock" />
         <field name="sequence">5</field>
         <field name="bom_id" ref="mrp_bom_fp01" />
     </record>
     <!-- AS-01 -->
     <record id="mrp_bom_as01" model="mrp.bom">
         <field name="product_tmpl_id" ref="product_product_as01_product_template" />
         <field name="product_uom_id" ref="uom.product_uom_unit" />
-        <field name="location_id" ref="stock.stock_location_stock" />
         <field name="sequence">5</field>
     </record>
     <record id="mrp_bom_as01_line_rm01" model="mrp.bom.line">
         <field name="product_id" ref="product_product_rm01" />
         <field name="product_qty">1</field>
         <field name="product_uom_id" ref="uom.product_uom_unit" />
         <field name="sequence">5</field>
-        <field name="location_id" ref="stock.stock_location_stock" />
         <field name="bom_id" ref="mrp_bom_as01" />
     </record>
     <record id="mrp_bom_as01_line_rm02" model="mrp.bom.line">
         <field name="product_id" ref="product_product_rm02" />
         <field name="product_qty">1</field>
         <field name="product_uom_id" ref="uom.product_uom_unit" />
         <field name="sequence">10</field>
-        <field name="location_id" ref="stock.stock_location_stock" />
         <field name="bom_id" ref="mrp_bom_as01" />
     </record>
 </odoo>
diff --git a/ddmrp/demo/res_partner_demo.xml b/ddmrp/demo/res_partner_demo.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <record id="res_partner_forgeflow" model="res.partner">
-            <field name="name">ForgeFlow</field>
-            <field name="is_company">1</field>
-            <field name="company_id" ref="base.main_company" />
-            <field name="email">forgeflow@yourcompany.example.com</field>
-            <field name="street">Rambla de Catalunya</field>
-            <field name="city">Barcelona</field>
-            <field name="zip">08008</field>
-            <field name="website">https://www.forgeflow.com</field>
-            <field name="country_id" ref="base.es" />
-            <field
-                name="image_1920"
-                type="base64"
-                file="ddmrp/static/img/res_partner_forgeflow-image.png"
-            />
-        </record>
-    </data>
+<odoo noupdate="1">
+    <record id="res_partner_forgeflow" model="res.partner">
+        <field name="name">ForgeFlow</field>
+        <field name="is_company">1</field>
+        <field name="company_id" ref="base.main_company" />
+        <field name="email">forgeflow@yourcompany.example.com</field>
+        <field name="street">Rambla de Catalunya</field>
+        <field name="city">Barcelona</field>
+        <field name="zip">08008</field>
+        <field name="website">https://www.forgeflow.com</field>
+        <field name="country_id" ref="base.es" />
+        <field
+            name="image_1920"
+            type="base64"
+            file="ddmrp/static/img/res_partner_forgeflow-image.png"
+        />
+    </record>
 </odoo>