From 893c5b265c99cfbf48d0eea5f149ce58c35bd013 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Mon, 19 Dec 2022 16:10:02 +0100 Subject: [PATCH] [REW] mrp_multi_level_estimate: remove unneeded dependency Remove unneeded dependency to date_range and relicense to LGPL. --- mrp_multi_level_estimate/README.rst | 4 +- mrp_multi_level_estimate/__manifest__.py | 8 ++-- mrp_multi_level_estimate/models/mrp_area.py | 2 +- .../models/product_mrp_area.py | 2 +- .../tests/test_mrp_multi_level_estimate.py | 42 ++++++++----------- .../wizards/mrp_multi_level.py | 2 +- 6 files changed, 26 insertions(+), 34 deletions(-) diff --git a/mrp_multi_level_estimate/README.rst b/mrp_multi_level_estimate/README.rst index 6534eb5af..7a574717a 100644 --- a/mrp_multi_level_estimate/README.rst +++ b/mrp_multi_level_estimate/README.rst @@ -23,7 +23,7 @@ MRP Multi Level Estimate :target: https://runbot.odoo-community.org/runbot/129/15.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Integration for MRP Multi Level and `Stock Demand Estimates `_ system. @@ -84,7 +84,7 @@ promote its widespread use. Current `maintainer `__: -|maintainer-LoisRForgeFlow| +|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 02d5bd6c4..234cad71f 100644 --- a/mrp_multi_level_estimate/__manifest__.py +++ b/mrp_multi_level_estimate/__manifest__.py @@ -1,17 +1,17 @@ -# Copyright 2019-22 ForgeFlow S.L. (http://www.forgeflow.com) -# License AGPL-3.0 or later (https://www.gnu.org/licenses/Agpl.html). +# Copyright 2019-23 ForgeFlow S.L. (http://www.forgeflow.com) +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). { "name": "MRP Multi Level Estimate", "version": "15.0.1.0.1", "development_status": "Production/Stable", - "license": "AGPL-3", + "license": "LGPL-3", "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", - "depends": ["mrp_multi_level", "stock_demand_estimate_matrix"], + "depends": ["mrp_multi_level", "stock_demand_estimate"], "data": ["views/product_mrp_area_views.xml", "views/mrp_area_views.xml"], "installable": True, "application": False, diff --git a/mrp_multi_level_estimate/models/mrp_area.py b/mrp_multi_level_estimate/models/mrp_area.py index 3f53a5ca8..7f920ea8a 100644 --- a/mrp_multi_level_estimate/models/mrp_area.py +++ b/mrp_multi_level_estimate/models/mrp_area.py @@ -1,6 +1,6 @@ # Copyright 2022 ForgeFlow S.L. (http://www.forgeflow.com) # - Lois Rilo Antelo -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from odoo import fields, models diff --git a/mrp_multi_level_estimate/models/product_mrp_area.py b/mrp_multi_level_estimate/models/product_mrp_area.py index 3202a306f..bb36a7e4d 100644 --- a/mrp_multi_level_estimate/models/product_mrp_area.py +++ b/mrp_multi_level_estimate/models/product_mrp_area.py @@ -1,6 +1,6 @@ # 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). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from odoo import fields, models diff --git a/mrp_multi_level_estimate/tests/test_mrp_multi_level_estimate.py b/mrp_multi_level_estimate/tests/test_mrp_multi_level_estimate.py index e529e13e2..a06126550 100644 --- a/mrp_multi_level_estimate/tests/test_mrp_multi_level_estimate.py +++ b/mrp_multi_level_estimate/tests/test_mrp_multi_level_estimate.py @@ -1,10 +1,8 @@ -# Copyright 2018-20 ForgeFlow S.L. (http://www.forgeflow.com) +# Copyright 2018-22 ForgeFlow S.L. (http://www.forgeflow.com) # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). from datetime import datetime, timedelta -from dateutil.rrule import WEEKLY - from odoo.addons.mrp_multi_level.tests.common import TestMrpMultiLevelCommon @@ -39,44 +37,38 @@ class TestMrpMultiLevelEstimate(TestMrpMultiLevelCommon): } ) - # Create Date Ranges: - cls.dr_type = cls.env["date.range.type"].create( - {"name": "Weeks", "company_id": False, "allow_overlap": False} - ) + # Create 3 consecutive estimates of 1 week length each. today = datetime.today().replace(hour=0) - generator = cls.env["date.range.generator"].create( - { - "date_start": today - timedelta(days=3), - "name_prefix": "W-", - "type_id": cls.dr_type.id, - "duration_count": 1, - "unit_of_time": str(WEEKLY), - "count": 3, - } - ) - generator.action_apply() + date_start_1 = today - timedelta(days=3) + date_end_1 = date_start_1 + timedelta(days=6) + date_start_2 = date_end_1 + timedelta(days=1) + date_end_2 = date_start_2 + timedelta(days=6) + date_start_3 = date_end_2 + timedelta(days=1) + date_end_3 = date_start_3 + timedelta(days=6) + start_dates = [date_start_1, date_start_2, date_start_3] + end_dates = [date_end_1, date_end_2, date_end_3] + cls.date_within_ranges = today - timedelta(days=2) cls.date_without_ranges = today + timedelta(days=150) - # Create Demand Estimates: - ranges = cls.env["date.range"].search([("type_id", "=", cls.dr_type.id)]) qty = 140.0 - for dr in ranges: + for sd, ed in zip(start_dates, end_dates): qty += 70.0 - cls._create_demand_estimate(cls.prod_test, cls.stock_location, dr, qty) - cls._create_demand_estimate(cls.prod_test, cls.estimate_loc, dr, qty) + cls._create_demand_estimate(cls.prod_test, cls.stock_location, sd, ed, qty) + cls._create_demand_estimate(cls.prod_test, cls.estimate_loc, sd, ed, qty) cls.mrp_multi_level_wiz.create({}).run_mrp_multi_level() @classmethod - def _create_demand_estimate(cls, product, location, date_range, qty): + def _create_demand_estimate(cls, product, location, date_from, date_to, qty): cls.estimate_obj.create( { "product_id": product.id, "location_id": location.id, "product_uom": product.uom_id.id, "product_uom_qty": qty, - "date_range_id": date_range.id, + "manual_date_from": date_from, + "manual_date_to": date_to, } ) diff --git a/mrp_multi_level_estimate/wizards/mrp_multi_level.py b/mrp_multi_level_estimate/wizards/mrp_multi_level.py index 300bef39f..4065645f3 100644 --- a/mrp_multi_level_estimate/wizards/mrp_multi_level.py +++ b/mrp_multi_level_estimate/wizards/mrp_multi_level.py @@ -1,6 +1,6 @@ # Copyright 2019-22 ForgeFlow S.L. (http://www.forgeflow.com) # - Lois Rilo -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). import logging from datetime import timedelta