Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add UOM validation for planned-qty

Browse Source
This commit is contained in:
s-aga-r 2022-06-22 10:48:49 +05:30
parent ce1b4e40a1
commit 00807abe31
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@ -25,6 +25,7 @@ from erpnext.manufacturing.doctype.bom.bom import get_children as get_bom_childr
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
from erpnext.manufacturing.doctype.work_order.work_order import get_item_details from erpnext.manufacturing.doctype.work_order.work_order import get_item_details
from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults
from erpnext.utilities.transaction_base import validate_uom_is_integer
class ProductionPlan(Document): class ProductionPlan(Document):
@ -33,6 +34,7 @@ class ProductionPlan(Document):
self.calculate_total_planned_qty() self.calculate_total_planned_qty()
self.set_status() self.set_status()
self._rename_temporary_references() self._rename_temporary_references()
validate_uom_is_integer(self, "stock_uom", "planned_qty")
def set_pending_qty_in_row_without_reference(self): def set_pending_qty_in_row_without_reference(self):
"Set Pending Qty in independent rows (not from SO or MR)." "Set Pending Qty in independent rows (not from SO or MR)."

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

@ -679,15 +679,23 @@ class TestProductionPlan(FrappeTestCase):
self.assertFalse(pp.all_items_completed()) self.assertFalse(pp.all_items_completed())
def test_production_plan_planned_qty(self): def test_production_plan_planned_qty(self):
pln = create_production_plan(item_code="_Test FG Item", planned_qty=0.55) # Case 1: When Planned Qty is non-integer and UOM is integer.
pln.make_work_order() from erpnext.utilities.transaction_base import UOMMustBeIntegerError
work_order = frappe.db.get_value("Work Order", {"production_plan": pln.name}, "name")
wo_doc = frappe.get_doc("Work Order", work_order) self.assertRaises(
wo_doc.update( UOMMustBeIntegerError, create_production_plan, item_code="_Test FG Item", planned_qty=0.55
{"wip_warehouse": "Work In Progress - _TC", "fg_warehouse": "Finished Goods - _TC"}
) )
wo_doc.submit()
self.assertEqual(wo_doc.qty, 0.55) # Case 2: When Planned Qty is non-integer and UOM is also non-integer.
from erpnext.stock.doctype.item.test_item import make_item
fg_item = make_item(properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1"}).name
bom_item = make_item().name
make_bom(item=fg_item, raw_materials=[bom_item], source_warehouse="_Test Warehouse - _TC")
pln = create_production_plan(item_code=fg_item, planned_qty=0.55, stock_uom="_Test UOM 1")
self.assertEqual(pln.po_items[0].planned_qty, 0.55)
def test_temporary_name_relinking(self): def test_temporary_name_relinking(self):
@ -751,6 +759,7 @@ def create_production_plan(**args):
"bom_no": frappe.db.get_value("Item", args.item_code, "default_bom"), "bom_no": frappe.db.get_value("Item", args.item_code, "default_bom"),
"planned_qty": args.planned_qty or 1, "planned_qty": args.planned_qty or 1,
"planned_start_date": args.planned_start_date or now_datetime(), "planned_start_date": args.planned_start_date or now_datetime(),
"stock_uom": args.stock_uom or "Nos",
}, },
) )