Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: incorrect material request quantity in Production Plan (backport #38566) #38578

Merged
merged 1 commit into from
Dec 5, 2023
Merged

fix: incorrect material request quantity in Production Plan (backport #38566) #38578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions erpnext/manufacturing/doctype/production_plan/production_plan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,19 +1521,23 @@ def get_materials_from_other_locations(item, warehouses, new_mr_items, company):
)

locations = get_available_item_locations(
item.get("item_code"), warehouses, item.get("quantity"), company, ignore_validation=True
item.get("item_code"),
warehouses,
item.get("quantity") * item.get("conversion_factor"),
company,
ignore_validation=True,
)

required_qty = item.get("quantity")
if item.get("conversion_factor") and item.get("purchase_uom") != item.get("stock_uom"):
# Convert qty to stock UOM
required_qty = required_qty * item.get("conversion_factor")

# get available material by transferring to production warehouse
for d in locations:
if required_qty <= 0:
return

conversion_factor = 1.0
if purchase_uom != stock_uom and purchase_uom == item["uom"]:
conversion_factor = get_uom_conversion_factor(item["item_code"], item["uom"])

new_dict = copy.deepcopy(item)
quantity = required_qty if d.get("qty") > required_qty else d.get("qty")

Expand All @@ -1543,10 +1547,11 @@ def get_materials_from_other_locations(item, warehouses, new_mr_items, company):
"material_request_type": "Material Transfer",
"uom": new_dict.get("stock_uom"), # internal transfer should be in stock UOM
"from_warehouse": d.get("warehouse"),
"conversion_factor": 1.0,
}
)

required_qty -= quantity / conversion_factor
required_qty -= quantity
new_mr_items.append(new_dict)

# raise purchase request for remaining qty
Expand All @@ -1558,7 +1563,7 @@ def get_materials_from_other_locations(item, warehouses, new_mr_items, company):
if frappe.db.get_value("UOM", purchase_uom, "must_be_whole_number"):
required_qty = ceil(required_qty)

item["quantity"] = required_qty
item["quantity"] = required_qty / item.get("conversion_factor")

new_mr_items.append(item)

Expand Down
56 changes: 55 additions & 1 deletion erpnext/manufacturing/doctype/production_plan/test_production_plan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,12 +1272,14 @@ def test_transfer_and_purchase_mrp_for_purchase_uom(self):
for row in items:
row = frappe._dict(row)
if row.material_request_type == "Material Transfer":
self.assertTrue(row.uom == row.stock_uom)
self.assertTrue(row.from_warehouse in [wh1, wh2])
self.assertEqual(row.quantity, 2)

if row.material_request_type == "Purchase":
self.assertTrue(row.uom != row.stock_uom)
self.assertTrue(row.warehouse == mrp_warhouse)
self.assertEqual(row.quantity, 12)
self.assertEqual(row.quantity, 12.0)

def test_mr_qty_for_same_rm_with_different_sub_assemblies(self):
from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
Expand Down Expand Up @@ -1393,6 +1395,58 @@ def test_reserve_sub_assembly_items(self):

self.assertEqual(after_qty, before_qty)

def test_material_request_qty_purchase_and_material_transfer(self):
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse

fg_item = make_item(properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1"}).name
bom_item = make_item(
properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1", "purchase_uom": "Nos"}
).name

store_warehouse = create_warehouse("Store Warehouse", company="_Test Company")
rm_warehouse = create_warehouse("RM Warehouse", company="_Test Company")

make_stock_entry(
item_code=bom_item,
qty=60,
target=store_warehouse,
rate=99,
)

if not frappe.db.exists("UOM Conversion Detail", {"parent": bom_item, "uom": "Nos"}):
doc = frappe.get_doc("Item", bom_item)
doc.append("uoms", {"uom": "Nos", "conversion_factor": 10})
doc.save()

make_bom(item=fg_item, raw_materials=[bom_item], source_warehouse="_Test Warehouse - _TC")

pln = create_production_plan(
item_code=fg_item, planned_qty=10, stock_uom="_Test UOM 1", do_not_submit=1
)

pln.for_warehouse = rm_warehouse
items = get_items_for_material_requests(
pln.as_dict(), warehouses=[{"warehouse": store_warehouse}]
)

for row in items:
self.assertEqual(row.get("quantity"), 10.0)
self.assertEqual(row.get("material_request_type"), "Material Transfer")
self.assertEqual(row.get("uom"), "_Test UOM 1")
self.assertEqual(row.get("from_warehouse"), store_warehouse)
self.assertEqual(row.get("conversion_factor"), 1.0)

items = get_items_for_material_requests(
pln.as_dict(), warehouses=[{"warehouse": pln.for_warehouse}]
)

for row in items:
self.assertEqual(row.get("quantity"), 1.0)
self.assertEqual(row.get("material_request_type"), "Purchase")
self.assertEqual(row.get("uom"), "Nos")
self.assertEqual(row.get("conversion_factor"), 10.0)


def create_production_plan(**args):
"""
Expand Down
Loading