nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-09 23:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(manufacturing): apply safety stock once across Production Plan rows (#58806)

Browse Source 
* fix(manufacturing): apply safety stock once across Production Plan rows

* test(manufacturing): cover safety stock once across Production Plan rows
This commit is contained in:
Mihir Kandoi
2026-09-07 19:04:26 +05:30
committed by GitHub
parent b1c0921c2b
commit 65048863db
2 changed files with 100 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/manufacturing/doctype/production_plan/services/material_request.py
View File

@@ -568,12 +568,10 @@ def _required_qty_for_mr(
):
safety_stock = flt(row["safety_stock"]) if include_safety_stock else 0
qty = flt(row.get("qty"))
if not ignore_existing_ordered_qty or bin_dict.get("projected_qty", 0) < 0:
return _adjust_required_qty_for_uom(row, qty + safety_stock)
projected_qty = max(0, flt(bin_dict.get("projected_qty"))) if ignore_existing_ordered_qty else 0
key = (row.get("item_code"), warehouse)
available_qty = flt(bin_dict.get("projected_qty", 0)) - consumed_qty[key]
available_qty = projected_qty - consumed_qty[key]
required_qty = max(0, qty - (available_qty - safety_stock))
required_qty = _adjust_required_qty_for_uom(row, required_qty)
consumed_qty[key] += qty - required_qty

98
erpnext/manufacturing/doctype/production_plan/test_production_plan.py
View File

@@ -1729,6 +1729,104 @@ class TestProductionPlan(ERPNextTestSuite):
quantities = sorted(flt(d.get("quantity")) for d in items if d.get("item_code") == rm_item)
self.assertEqual(quantities, [0, 10])
def test_safety_stock_added_once_with_negative_or_ignored_projected_qty(self):
from erpnext.stock.utils import get_or_make_bin
rm_item = make_item(properties={"is_stock_item": 1, "safety_stock": 100}).name
bin_name = get_or_make_bin(rm_item, "_Test Warehouse - _TC")
pln = self._plan_with_shared_raw_material(rm_item, qty_per_order=250)
pln.po_items[1].planned_qty = 1000
pln.include_safety_stock = 1
for projected_qty in (-5, 0, 200, 1500):
frappe.db.set_value("Bin", bin_name, "projected_qty", projected_qty)
for consider_projected_qty in (0, 1):
with self.subTest(projected_qty=projected_qty, consider_projected_qty=consider_projected_qty):
pln.ignore_existing_ordered_qty = consider_projected_qty
items = get_items_for_material_requests(pln.as_dict())
expected_qty = [350, 1000]
if consider_projected_qty and projected_qty > 0:
expected_qty = [150, 1000] if projected_qty == 200 else [0, 0]
self.assertEqual([row["quantity"] for row in items], expected_qty)
self.assertEqual([row["required_bom_qty"] for row in items], [250, 1000])
self.assertEqual([row["safety_stock"] for row in items], [100, 100])
self.assertEqual(
[row["sales_order"] for row in items], [row.sales_order for row in pln.po_items]
)
def test_safety_stock_counted_once_before_minimum_order_qty(self):
from erpnext.stock.utils import get_or_make_bin
rm_item = make_item(properties={"is_stock_item": 1, "safety_stock": 100, "min_order_qty": 1234}).name
bin_name = get_or_make_bin(rm_item, "_Test Warehouse - _TC")
frappe.db.set_value("Bin", bin_name, "projected_qty", -5)
pln = self._plan_with_shared_raw_material(rm_item, qty_per_order=250)
pln.include_safety_stock = 1
pln.consider_minimum_order_qty = 1
for second_qty, expected_qty in ((800, [1234, 0]), (1000, [1234, 1234])):
with self.subTest(second_qty=second_qty):
pln.po_items[1].planned_qty = second_qty
items = get_items_for_material_requests(pln.as_dict())
self.assertEqual([row["quantity"] for row in items], expected_qty)
def test_safety_stock_disabled_with_negative_projected_qty(self):
from erpnext.stock.utils import get_or_make_bin
rm_item = make_item(properties={"is_stock_item": 1, "safety_stock": 100}).name
bin_name = get_or_make_bin(rm_item, "_Test Warehouse - _TC")
frappe.db.set_value("Bin", bin_name, "projected_qty", -5)
pln = self._plan_with_shared_raw_material(rm_item, qty_per_order=250)
pln.po_items[1].planned_qty = 1000
items = get_items_for_material_requests(pln.as_dict())
self.assertEqual([row["quantity"] for row in items], [250, 1000])
def test_safety_stock_is_separate_for_each_item_and_warehouse(self):
from collections import defaultdict
from erpnext.manufacturing.doctype.production_plan.services.material_request import (
_required_qty_for_mr,
)
row = frappe._dict(qty=250, safety_stock=100, purchase_uom="Nos", stock_uom="Nos")
items_and_warehouses = [
("Raw Material Item 1", "_Test Warehouse - _TC"),
("Raw Material Item 1", "_Test Warehouse 1 - _TC"),
("Raw Material Item 2", "_Test Warehouse - _TC"),
]
for consider_projected_qty in (0, 1):
with self.subTest(consider_projected_qty=consider_projected_qty):
consumed_qty = defaultdict(float)
quantities = []
for item_code, warehouse in items_and_warehouses * 2:
row.item_code = item_code
quantities.append(
_required_qty_for_mr(
row, consider_projected_qty, warehouse, {"projected_qty": -5}, consumed_qty, True
)
)
self.assertEqual(quantities, [350, 350, 350, 250, 250, 250])
def test_safety_stock_added_once_before_transferring_materials(self):
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
from erpnext.stock.utils import get_or_make_bin
rm_item = make_item(properties={"is_stock_item": 1, "safety_stock": 100, "min_order_qty": 1234}).name
source_warehouse = create_warehouse("Safety Stock Source Warehouse", company="_Test Company")
make_stock_entry(item_code=rm_item, qty=2000, rate=100, target=source_warehouse)
bin_name = get_or_make_bin(rm_item, "_Test Warehouse - _TC")
frappe.db.set_value("Bin", bin_name, "projected_qty", -5)
pln = self._plan_with_shared_raw_material(rm_item, qty_per_order=250)
pln.po_items[1].planned_qty = 1000
pln.for_warehouse = "_Test Warehouse - _TC"
pln.include_safety_stock = 1
pln.consider_minimum_order_qty = 1
items = get_items_for_material_requests(pln.as_dict(), warehouses=[{"warehouse": source_warehouse}])
self.assertEqual([row["material_request_type"] for row in items], ["Material Transfer"] * 2)
self.assertEqual([row["quantity"] for row in items], [350, 1000])
def test_minimum_order_qty_surplus_covers_later_rows(self):
rm_item = make_item(properties={"is_stock_item": 1, "min_order_qty": 100, "valuation_rate": 100}).name
make_stock_entry(item_code=rm_item, qty=40, rate=100, target="_Test Warehouse - _TC")