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

fix: over production percentage not considered in validation

Browse Source
This commit is contained in:
Rohit Waghchaure 2023-05-03 23:22:59 +05:30
parent 9aa646512a
commit a84d0af81e
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@ -87,6 +87,12 @@ class JobCard(Document):
frappe.db.get_value("Work Order Operation", self.operation_id, "completed_qty") frappe.db.get_value("Work Order Operation", self.operation_id, "completed_qty")
) )
over_production_percentage = flt(
frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order")
)
wo_qty = wo_qty + (wo_qty * over_production_percentage / 100)
job_card_qty = frappe.get_all( job_card_qty = frappe.get_all(
"Job Card", "Job Card",
fields=["sum(for_quantity)"], fields=["sum(for_quantity)"],
@ -101,8 +107,17 @@ class JobCard(Document):
job_card_qty = flt(job_card_qty[0][0]) if job_card_qty else 0 job_card_qty = flt(job_card_qty[0][0]) if job_card_qty else 0
if job_card_qty and ((job_card_qty - completed_qty) > wo_qty): if job_card_qty and ((job_card_qty - completed_qty) > wo_qty):
msg = f"""Job Card quantity cannot be greater than form_link = get_link_to_form("Manufacturing Settings", "Manufacturing Settings")
Work Order quantity for the operation {self.operation}"""
msg = f"""
Qty To Manufacture in the job card
cannot be greater than Qty To Manufacture in the
work order for the operation {bold(self.operation)}.
<br><br><b>Solution: </b> Either you can reduce the
Qty To Manufacture in the job card or set the
'Overproduction Percentage For Work Order'
in the {form_link}."""
frappe.throw(_(msg), title=_("Extra Job Card Quantity")) frappe.throw(_(msg), title=_("Extra Job Card Quantity"))
def set_sub_operations(self): def set_sub_operations(self):

8
erpnext/manufacturing/doctype/work_order/test_work_order.py
View File

@ -1649,6 +1649,14 @@ class TestWorkOrder(FrappeTestCase):
job_card2 = frappe.copy_doc(job_card_doc) job_card2 = frappe.copy_doc(job_card_doc)
self.assertRaises(frappe.ValidationError, job_card2.save) self.assertRaises(frappe.ValidationError, job_card2.save)
frappe.db.set_single_value(
"Manufacturing Settings", "overproduction_percentage_for_work_order", 100
)
job_card2 = frappe.copy_doc(job_card_doc)
job_card2.time_logs = []
job_card2.save()
def prepare_data_for_workstation_type_check(): def prepare_data_for_workstation_type_check():
from erpnext.manufacturing.doctype.operation.test_operation import make_operation from erpnext.manufacturing.doctype.operation.test_operation import make_operation