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

Merge pull request #28310 from anupamvs/manufacturing-work-order-closed

Browse Source 
fix: function name [is_work_order_stopped -> is_work_order_closed]
This commit is contained in:
Anupam Kumar 2021-11-22 12:56:24 +05:30 committed by GitHub
commit 3d0de59131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/job_card/job_card.js
View File

@ -28,7 +28,7 @@ frappe.ui.form.on('Job Card', {
frappe.flags.resume_job = 0; frappe.flags.resume_job = 0;
let has_items = frm.doc.items && frm.doc.items.length; let has_items = frm.doc.items && frm.doc.items.length;
if (frm.doc.__onload.work_order_stopped) { if (frm.doc.__onload.work_order_closed) {
frm.disable_save(); frm.disable_save();
return; return;
} }

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

@ -36,7 +36,7 @@ class JobCard(Document):
def onload(self): def onload(self):
excess_transfer = frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer") excess_transfer = frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer")
self.set_onload("job_card_excess_transfer", excess_transfer) self.set_onload("job_card_excess_transfer", excess_transfer)
self.set_onload("work_order_stopped", self.is_work_order_stopped()) self.set_onload("work_order_closed", self.is_work_order_closed())
def validate(self): def validate(self):
self.validate_time_logs() self.validate_time_logs()
@ -549,10 +549,10 @@ class JobCard(Document):
.format(message, bold(row.operation), bold(self.operation)), OperationSequenceError) .format(message, bold(row.operation), bold(self.operation)), OperationSequenceError)
def validate_work_order(self): def validate_work_order(self):
if self.is_work_order_stopped(): if self.is_work_order_closed():
frappe.throw(_("You can't make any changes to Job Card since Work Order is stopped.")) frappe.throw(_("You can't make any changes to Job Card since Work Order is closed."))
def is_work_order_stopped(self): def is_work_order_closed(self):
if self.work_order: if self.work_order:
status = frappe.get_value('Work Order', self.work_order) status = frappe.get_value('Work Order', self.work_order)