DDMRP
!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:74bf548cd863fc5b541716caaacd7c4929c727a144d3c7b2d2d53218eba2eec0 +!! source digest: sha256:72c250aba14c937599815388cf7f0f26fa7cf6dcc72bd42a82cbd8bfc1d39efb !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
Demand Driven Material Requirements Planning is a formal multi-echelon
diff --git a/ddmrp/static/src/js/mrp_bom_report.js b/ddmrp/static/src/js/mrp_bom_report.js
new file mode 100644
index 000000000..260c7c382
--- /dev/null
+++ b/ddmrp/static/src/js/mrp_bom_report.js
@@ -0,0 +1,33 @@
+odoo.define("ddmrp.mrp_bom_report", function (require) {
+ "use strict";
+
+ var core = require("web.core");
+ var MrpBomReport = require("mrp.mrp_bom_report");
+
+ var DdmrpBomReport = MrpBomReport.extend({
+ init: function (parent, action) {
+ this._super.apply(this, arguments);
+ this.given_context.location_id = action.context.location_id || false;
+ },
+ get_bom: function (event) {
+ var self = this;
+ var $parent = $(event.currentTarget).closest("tr");
+ var activeID = $parent.data("id");
+ var productID = $parent.data("product_id");
+ var lineID = $parent.data("line");
+ var qty = $parent.data("qty");
+ var level = $parent.data("level") || 0;
+ return this._rpc({
+ model: "report.mrp.report_bom_structure",
+ method: "get_bom",
+ args: [activeID, productID, parseFloat(qty), lineID, level + 1],
+ context: this.given_context,
+ }).then(function (result) {
+ self.render_html(event, $parent, result);
+ });
+ },
+ });
+
+ core.action_registry.add("mrp_bom_report", DdmrpBomReport);
+ return DdmrpBomReport;
+});
diff --git a/ddmrp/tests/common.py b/ddmrp/tests/common.py
index a70a98968..174f779d6 100644
--- a/ddmrp/tests/common.py
+++ b/ddmrp/tests/common.py
@@ -176,6 +176,16 @@ def setUpClass(cls):
"route_ids": [(6, 0, buy_route.ids)],
}
)
+ cls.product_purchased_2 = cls.productModel.create(
+ {
+ "name": "product Purchased 2",
+ "standard_price": 1,
+ "type": "product",
+ "uom_id": cls.uom_unit.id,
+ "default_code": "B",
+ "route_ids": [(6, 0, buy_route.ids)],
+ }
+ )
cls.supinfo_model.create(
{
"product_tmpl_id": cls.product_purchased.product_tmpl_id.id,
@@ -203,17 +213,23 @@ def setUpClass(cls):
cls.color_orange = cls.env["product.attribute.value"].create(
{"name": "Orange", "attribute_id": cls.color_attribute.id, "sequence": 2}
)
+ cls.color_green = cls.env["product.attribute.value"].create(
+ {"name": "Green", "attribute_id": cls.color_attribute.id, "sequence": 3}
+ )
cls.p_c_color_attribute_line = cls.env[
"product.template.attribute.line"
].create(
{
"product_tmpl_id": cls.template_c.id,
"attribute_id": cls.color_attribute.id,
- "value_ids": [(6, 0, [cls.color_blue.id, cls.color_orange.id])],
+ "value_ids": [
+ (6, 0, [cls.color_blue.id, cls.color_orange.id, cls.color_green.id])
+ ],
}
)
cls.product_c_blue = cls.template_c.product_variant_ids[0]
cls.product_c_orange = cls.template_c.product_variant_ids[1]
+ cls.product_c_green = cls.template_c.product_variant_ids[2]
cls.p_c_supinfo_blue = cls.supinfo_model.create(
{
"product_tmpl_id": cls.template_c.id,
diff --git a/ddmrp/tests/test_ddmrp.py b/ddmrp/tests/test_ddmrp.py
index f3c2753cf..adc28573c 100644
--- a/ddmrp/tests/test_ddmrp.py
+++ b/ddmrp/tests/test_ddmrp.py
@@ -436,7 +436,6 @@ def test_19_qualified_demand_6_uom(self):
def _check_red_zone(
self, orderpoint, red_base_qty=0.0, red_safety_qty=0.0, red_zone_qty=0.0
):
-
# red base_qty = dlt * adu * lead time factor
self.assertEqual(orderpoint.red_base_qty, red_base_qty)
@@ -447,7 +446,6 @@ def _check_red_zone(
self.assertEqual(orderpoint.red_zone_qty, red_zone_qty)
def _check_yellow_zone(self, orderpoint, yellow_zone_qty=0.0, top_of_yellow=0.0):
-
# yellow_zone_qty = dlt * adu
self.assertEqual(orderpoint.yellow_zone_qty, yellow_zone_qty)
@@ -463,7 +461,6 @@ def _check_green_zone(
green_zone_qty=0.0,
top_of_green=0.0,
):
-
# green_zone_oc = order_cycle * adu
self.assertEqual(orderpoint.green_zone_oc, green_zone_oc)
@@ -800,7 +797,8 @@ def test_26_auto_procure_stockout_and_auto_nfp(self):
self.assertEqual(self.buffer_purchase.procure_recommended_qty, 0)
def test_27_qty_multiple_tolerance(self):
- buffer = self.bufferModel.create(
+ original_vals = self.buffer_purchase.read()[0]
+ self.buffer_purchase.update(
{
"buffer_profile_id": self.buffer_profile_override.id,
"product_id": self.product_purchased.id,
@@ -816,21 +814,23 @@ def test_27_qty_multiple_tolerance(self):
)
date_move = datetime.today()
self.create_picking_out(self.product_purchased, date_move, 2)
- buffer.cron_actions()
- self.assertEqual(buffer.net_flow_position, -2.0)
- self.assertEqual(buffer.procure_recommended_qty, 500)
+ self.buffer_purchase.cron_actions()
+ self.assertEqual(self.buffer_purchase.net_flow_position, -2.0)
+ self.assertEqual(self.buffer_purchase.procure_recommended_qty, 500)
# Set the tolerance
- buffer.company_id.ddmrp_qty_multiple_tolerance = 10.0
+ self.buffer_purchase.company_id.ddmrp_qty_multiple_tolerance = 10.0
# Tolerance: 10% 250 = 25, strictly needed 272 (under tolerance)
- buffer.cron_actions()
- self.assertEqual(buffer.procure_recommended_qty, 250)
+ self.buffer_purchase.cron_actions()
+ self.assertEqual(self.buffer_purchase.procure_recommended_qty, 250)
# Add more demand
self.create_picking_out(self.product_purchased, date_move, 20)
- buffer.cron_actions()
- self.assertEqual(buffer.net_flow_position, -22.0)
+ self.buffer_purchase.cron_actions()
+ self.assertEqual(self.buffer_purchase.net_flow_position, -22.0)
# Tolerance: 10% 250 = 25, strictly needed 294 (above tolerance)
- buffer.cron_actions()
- self.assertEqual(buffer.procure_recommended_qty, 500)
+ self.buffer_purchase.cron_actions()
+ self.assertEqual(self.buffer_purchase.procure_recommended_qty, 500)
+ original_vals.pop("id")
+ self.buffer_purchase.update(original_vals)
# TEST SECTION 3: DLT, BoM's and misc
@@ -850,7 +850,7 @@ def test_30_bom_buffer_fields(self):
"adu_calculation_method": self.adu_fixed.id,
}
)
- self.bom_a.location_id = self.supplier_location.id
+ self.bom_a.context_location_id = self.supplier_location.id
self.assertTrue(self.bom_a.is_buffered)
self.assertEqual(self.bom_a.buffer_id, new_buffer)
new_bom = self.env["mrp.bom"].create(
@@ -986,6 +986,54 @@ def test_37_bom_buffer_fields_multi_company(self):
self.assertTrue(bom_line.is_buffered)
self.assertEqual(bom_line.buffer_id, component_buffer)
+ def test_38_bom_dlt_computation_multi_location(self):
+ """
+ If AS01 bom has no location it means that it can be manufactured
+ in more than one location.
+ """
+ bom_fp01 = self.env.ref("ddmrp.mrp_bom_fp01")
+ buffer1_fp01 = self.env.ref("ddmrp.stock_buffer_fp01")
+ self.assertEqual(bom_fp01.dlt, 22.0)
+ self.assertEqual(bom_fp01.buffer_id, buffer1_fp01)
+ self.assertEqual(len(bom_fp01.bom_line_ids), 1)
+ self.assertEqual(bom_fp01.bom_line_ids.is_buffered, False)
+ # Now create buffers in another location and check in that context
+ product_fp01 = self.env.ref("ddmrp.product_product_fp01")
+ product_as01 = self.env.ref("ddmrp.product_product_as01")
+ buffer2_fp01 = self.bufferModel.create(
+ {
+ "buffer_profile_id": self.buffer_profile_mmm.id,
+ "product_id": product_fp01.id,
+ "warehouse_id": self.warehouse.id,
+ "location_id": self.supplier_location.id,
+ "adu_calculation_method": self.adu_fixed.id,
+ }
+ )
+ buffer_as01 = self.bufferModel.create(
+ {
+ "buffer_profile_id": self.buffer_profile_mmm.id,
+ "product_id": product_as01.id,
+ "warehouse_id": self.warehouse.id,
+ "location_id": self.supplier_location.id,
+ "adu_calculation_method": self.adu_fixed.id,
+ }
+ )
+ bom_fp01.context_location_id = self.supplier_location.id
+ bom_fp01.bom_line_ids._compute_is_buffered()
+ bom_fp01._compute_dlt()
+ bom_fp01.bom_line_ids._compute_dlt()
+ self.assertEqual(bom_fp01.dlt, 2.0)
+ self.assertEqual(bom_fp01.buffer_id, buffer2_fp01)
+ self.assertEqual(len(bom_fp01.bom_line_ids), 1)
+ self.assertEqual(bom_fp01.bom_line_ids.is_buffered, True)
+ self.assertEqual(bom_fp01.bom_line_ids.buffer_id, buffer_as01)
+ # Check at the same time the DLT of 2 buffers using the same bom:
+ buffers = buffer1_fp01 + buffer2_fp01
+ buffers.invalidate_cache()
+ buffers._compute_dlt()
+ self.assertEqual(buffer1_fp01.dlt, 22)
+ self.assertEqual(buffer2_fp01.dlt, 2)
+
def test_40_bokeh_charts(self):
"""Check bokeh chart computation."""
date_move = datetime.today()
@@ -1104,3 +1152,98 @@ def test_44_resupply_from_another_warehouse(self):
buffer_distributed.distributed_source_location_id,
self.warehouse.lot_stock_id,
)
+
+ def test_45_adu_calculation_blended_120_days_estimated_mrp(self):
+ """Test blended ADU calculation method with direct and indirect demand."""
+ mrpMoveModel = self.env["mrp.move"]
+ mrpAreaModel = self.env["mrp.area"]
+ productMrpAreaModel = self.env["product.mrp.area"]
+ method = self.aducalcmethodModel.create(
+ {
+ "name": "Blended (120 d. estimates_mrp past, 120 d. estimates_mrp future)",
+ "method": "blended",
+ "source_past": "estimates_mrp",
+ "horizon_past": 120,
+ "factor_past": 0.5,
+ "source_future": "estimates_mrp",
+ "horizon_future": 120,
+ "factor_future": 0.5,
+ "company_id": self.main_company.id,
+ }
+ )
+ self.buffer_a.adu_calculation_method = method.id
+ mrp_area_id = mrpAreaModel.create(
+ {
+ "name": "WH/Stock",
+ "warehouse_id": self.warehouse.id,
+ "location_id": self.stock_location.id,
+ }
+ )
+ product_mrp_area_id = productMrpAreaModel.create(
+ {
+ "mrp_area_id": mrp_area_id.id,
+ "product_id": self.productA.id,
+ }
+ )
+ today = fields.Date.today()
+
+ # Past.
+ # create estimate: 120 units / 120 days = 1 unit/day
+ # create mrp move: 120 units / 120 days = 1 unit/day
+ dt = self.calendar.plan_days(-1 * 120, datetime.today())
+ estimate_date_from = dt.date()
+ estimate_date_to = self.calendar.plan_days(-1 * 2, datetime.today())
+ self.estimateModel.create(
+ {
+ "manual_date_from": estimate_date_from,
+ "manual_date_to": estimate_date_to,
+ "product_id": self.productA.id,
+ "product_uom_qty": 120,
+ "product_uom": self.productA.uom_id.id,
+ "location_id": self.stock_location.id,
+ }
+ )
+ mrpMoveModel.create(
+ {
+ "mrp_area_id": product_mrp_area_id.mrp_area_id.id,
+ "product_id": product_mrp_area_id.product_id.id,
+ "product_mrp_area_id": product_mrp_area_id.id,
+ "mrp_qty": -120,
+ "current_qty": 0,
+ "mrp_date": today - timedelta(days=5),
+ "current_date": None,
+ "mrp_type": "d",
+ "mrp_origin": "mrp",
+ }
+ )
+
+ # Future.
+ # create estimate: 120 units / 120 days = 1 unit/day
+ # create mrp move: 120 units / 120 days = 1 unit/day
+ self.estimateModel.create(
+ {
+ "manual_date_from": self.estimate_date_from,
+ "manual_date_to": self.estimate_date_to,
+ "product_id": self.productA.id,
+ "product_uom_qty": 120,
+ "product_uom": self.productA.uom_id.id,
+ "location_id": self.stock_location.id,
+ }
+ )
+ mrpMoveModel.create(
+ {
+ "mrp_area_id": product_mrp_area_id.mrp_area_id.id,
+ "product_id": product_mrp_area_id.product_id.id,
+ "product_mrp_area_id": product_mrp_area_id.id,
+ "mrp_qty": -120,
+ "current_qty": 0,
+ "mrp_date": today + timedelta(days=5),
+ "current_date": None,
+ "mrp_type": "d",
+ "mrp_origin": "mrp",
+ }
+ )
+
+ self.bufferModel.cron_ddmrp_adu()
+ to_assert_value = 2 * 0.5 + 2 * 0.5
+ self.assertEqual(self.buffer_a.adu, to_assert_value)
diff --git a/ddmrp/tests/test_ddmrp_distributed_source_location.py b/ddmrp/tests/test_ddmrp_distributed_source_location.py
index 338317eb8..cc4c8ee92 100644
--- a/ddmrp/tests/test_ddmrp_distributed_source_location.py
+++ b/ddmrp/tests/test_ddmrp_distributed_source_location.py
@@ -58,12 +58,12 @@ def setUpClass(cls):
)
# our product uses the replenishment route
- cls.product_c_orange.route_ids = replenish_route
+ cls.product_c_green.route_ids = replenish_route
cls.buffer_dist = cls.bufferModel.create(
{
"buffer_profile_id": cls.buffer_profile_distr.id,
- "product_id": cls.product_c_orange.id,
+ "product_id": cls.product_c_green.id,
"location_id": cls.stock_location.id,
"warehouse_id": cls.warehouse.id,
"qty_multiple": 1.0,
@@ -84,14 +84,14 @@ def test_distributed_source_location_id(self):
def test_distributed_source_location_qty(self):
self.env["stock.quant"]._update_available_quantity(
- self.product_c_orange, self.replenish_location, 4000
+ self.product_c_green, self.replenish_location, 4000
)
self.buffer_dist.invalidate_cache()
self.assertEqual(self.buffer_dist.distributed_source_location_qty, 4000)
self.env["stock.quant"]._update_reserved_quantity(
- self.product_c_orange, self.replenish_location, 500
+ self.product_c_green, self.replenish_location, 500
)
self.buffer_dist.invalidate_cache()
@@ -108,7 +108,7 @@ def _set_qty_and_create_replenish_wizard(
self, qty_in_replenish=4000, recommended_qty=10000
):
self.env["stock.quant"]._update_available_quantity(
- self.product_c_orange, self.replenish_location, 4000
+ self.product_c_green, self.replenish_location, 4000
)
# lie about the recommended qty (we only want to test if the limit is
# applied)
diff --git a/ddmrp/tests/test_distributed_max_proc_time.py b/ddmrp/tests/test_distributed_max_proc_time.py
index bcee7e4e1..54c928d6a 100644
--- a/ddmrp/tests/test_distributed_max_proc_time.py
+++ b/ddmrp/tests/test_distributed_max_proc_time.py
@@ -63,12 +63,12 @@ def setUpClass(cls):
)
# our product uses the replenishment route
- cls.product_c_orange.route_ids = replenish_route
+ cls.product_c_green.route_ids = replenish_route
cls.buffer_dist = cls.bufferModel.create(
{
"buffer_profile_id": cls.buffer_profile_distr.id,
- "product_id": cls.product_c_orange.id,
+ "product_id": cls.product_c_green.id,
"location_id": cls.stock_location.id,
"warehouse_id": cls.warehouse.id,
"qty_multiple": 1.0,
@@ -84,14 +84,14 @@ def test_reschedule_proc_time_no_calendar(self):
self.warehouse.calendar_id = False
self.env["stock.quant"]._update_available_quantity(
- self.product_c_orange, self.replenish_location, 4000
+ self.product_c_green, self.replenish_location, 4000
)
# lie about the recommended qty to force creation of replenishment
self.buffer_dist.procure_recommended_qty = 10000
self.create_orderpoint_procurement(self.buffer_dist)
moves = self.env["stock.move"].search(
- [("product_id", "=", self.product_c_orange.id)]
+ [("product_id", "=", self.product_c_green.id)]
)
self.assertRecordValues(
@@ -108,14 +108,14 @@ def test_reschedule_proc_time_with_calendar(self):
self.buffer_profile_distr.distributed_reschedule_max_proc_time = 90
self.env["stock.quant"]._update_available_quantity(
- self.product_c_orange, self.replenish_location, 4000
+ self.product_c_green, self.replenish_location, 4000
)
# lie about the recommended qty to force creation of replenishment
self.buffer_dist.procure_recommended_qty = 10000
self.create_orderpoint_procurement(self.buffer_dist)
moves = self.env["stock.move"].search(
- [("product_id", "=", self.product_c_orange.id)]
+ [("product_id", "=", self.product_c_green.id)]
)
self.assertRecordValues(
diff --git a/ddmrp/views/ddmrp_assets_backend.xml b/ddmrp/views/ddmrp_assets_backend.xml
index c6780e33d..c487be2a7 100644
--- a/ddmrp/views/ddmrp_assets_backend.xml
+++ b/ddmrp/views/ddmrp_assets_backend.xml
@@ -10,6 +10,10 @@
type="text/javascript"
src="/ddmrp/static/src/js/list_renderer_buffer_info.js"
/>
+
mrp.bom
+