From 389a1c87a84efd24cda3e542dda22c918b8e488f Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Thu, 2 Jan 2020 11:02:36 +0100 Subject: [PATCH 1/2] [12.0][FIX] mrp_multi_level_estimate: adapt to latest split of stock_demand_estimate module. --- mrp_multi_level_estimate/__manifest__.py | 2 +- mrp_multi_level_estimate/wizards/mrp_multi_level.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mrp_multi_level_estimate/__manifest__.py b/mrp_multi_level_estimate/__manifest__.py index a57ff4203..db095777b 100644 --- a/mrp_multi_level_estimate/__manifest__.py +++ b/mrp_multi_level_estimate/__manifest__.py @@ -14,7 +14,7 @@ "category": "Manufacturing", "depends": [ "mrp_multi_level", - "stock_demand_estimate", + "stock_demand_estimate_matrix", ], "data": [ "views/product_mrp_area_views.xml", diff --git a/mrp_multi_level_estimate/wizards/mrp_multi_level.py b/mrp_multi_level_estimate/wizards/mrp_multi_level.py index 70c47285e..d3bfc1e13 100644 --- a/mrp_multi_level_estimate/wizards/mrp_multi_level.py +++ b/mrp_multi_level_estimate/wizards/mrp_multi_level.py @@ -47,7 +47,7 @@ class MultiLevelMrp(models.TransientModel): return [ ("product_id", "=", product_mrp_area.product_id.id), ("location_id", "in", locations.ids), - ("date_range_id.date_end", ">=", fields.Date.today()), + ("date_to", ">=", fields.Date.today()), ] @api.model From 38e28d850242eb82cd93913e5790c942cbc2ae34 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Thu, 2 Jan 2020 11:05:58 +0100 Subject: [PATCH 2/2] [12.0][UPD] mrp_multi_level_estimate: eficent rebranded to forgeflow. --- mrp_multi_level_estimate/README.rst | 12 ++++++------ mrp_multi_level_estimate/__manifest__.py | 7 +++---- mrp_multi_level_estimate/models/product_mrp_area.py | 4 ++-- mrp_multi_level_estimate/readme/CONTRIBUTORS.rst | 2 +- .../static/description/index.html | 8 ++++---- .../tests/test_mrp_multi_level_estimate.py | 3 +-- mrp_multi_level_estimate/wizards/mrp_multi_level.py | 4 ++-- 7 files changed, 19 insertions(+), 21 deletions(-) diff --git a/mrp_multi_level_estimate/README.rst b/mrp_multi_level_estimate/README.rst index 2406e8d02..fac6e09dd 100644 --- a/mrp_multi_level_estimate/README.rst +++ b/mrp_multi_level_estimate/README.rst @@ -57,12 +57,12 @@ Credits Authors ~~~~~~~ -* Eficent +* ForgeFlow Contributors ~~~~~~~~~~~~ -* Lois Rilo +* Lois Rilo Maintainers ~~~~~~~~~~~ @@ -77,13 +77,13 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -.. |maintainer-lreficent| image:: https://github.com/lreficent.png?size=40px - :target: https://github.com/lreficent - :alt: lreficent +.. |maintainer-LoisRForgeFlow| image:: https://github.com/LoisRForgeFlow.png?size=40px + :target: https://github.com/LoisRForgeFlow + :alt: LoisRForgeFlow Current `maintainer `__: -|maintainer-lreficent| +|maintainer-LoisRForgeFlow| This module is part of the `OCA/manufacture `_ project on GitHub. diff --git a/mrp_multi_level_estimate/__manifest__.py b/mrp_multi_level_estimate/__manifest__.py index db095777b..55dc92b52 100644 --- a/mrp_multi_level_estimate/__manifest__.py +++ b/mrp_multi_level_estimate/__manifest__.py @@ -1,4 +1,4 @@ -# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# Copyright 2019-20 ForgeFlow S.L. (http://www.forgeflow.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/Agpl.html). { @@ -6,9 +6,8 @@ "version": "12.0.1.0.0", "development_status": "Beta", "license": "AGPL-3", - "author": "Eficent, " - "Odoo Community Association (OCA)", - "maintainers": ["lreficent"], + "author": "ForgeFlow, Odoo Community Association (OCA)", + "maintainers": ["LoisRForgeFlow"], "summary": "Allows to consider demand estimates using MRP multi level.", "website": "https://github.com/OCA/manufacture", "category": "Manufacturing", diff --git a/mrp_multi_level_estimate/models/product_mrp_area.py b/mrp_multi_level_estimate/models/product_mrp_area.py index f76b8d0d8..b8091d210 100644 --- a/mrp_multi_level_estimate/models/product_mrp_area.py +++ b/mrp_multi_level_estimate/models/product_mrp_area.py @@ -1,5 +1,5 @@ -# Copyright 2019 Eficent Business and IT Consulting Services S.L. -# - Lois Rilo Antelo +# Copyright 2019-20 ForgeFlow S.L. (http://www.forgeflow.com) +# - Lois Rilo Antelo # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo import fields, models diff --git a/mrp_multi_level_estimate/readme/CONTRIBUTORS.rst b/mrp_multi_level_estimate/readme/CONTRIBUTORS.rst index 4b574636c..77dfbe89e 100644 --- a/mrp_multi_level_estimate/readme/CONTRIBUTORS.rst +++ b/mrp_multi_level_estimate/readme/CONTRIBUTORS.rst @@ -1 +1 @@ -* Lois Rilo +* Lois Rilo diff --git a/mrp_multi_level_estimate/static/description/index.html b/mrp_multi_level_estimate/static/description/index.html index eb249d824..01cf37e93 100644 --- a/mrp_multi_level_estimate/static/description/index.html +++ b/mrp_multi_level_estimate/static/description/index.html @@ -3,7 +3,7 @@ - + MRP Multi Level Estimate