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

[Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order

Browse Source 
Disabled the following buttons:
- Make Timesheet
- Start
- Finish `

- A better fix than 316f78f859
- Sets the Status to In Process or Not Started instead of Unstopped
- Displays this same status on the client prompt (msgprint)
This commit is contained in:
Javier Wong 2016-08-07 16:01:49 +08:00
parent 8793b823af
commit e6cd228288
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@ -38,7 +38,7 @@ frappe.ui.form.on("Production Order", {
frm.trigger('show_progress'); frm.trigger('show_progress');
} }
if(frm.doc.docstatus == 1){ if(frm.doc.docstatus == 1 && frm.doc.status != 'Stopped'){
frm.add_custom_button(__('Make Timesheet'), function(){ frm.add_custom_button(__('Make Timesheet'), function(){
frappe.model.open_mapped_doc({ frappe.model.open_mapped_doc({
method: "erpnext.manufacturing.doctype.production_order.production_order.make_new_timesheet", method: "erpnext.manufacturing.doctype.production_order.production_order.make_new_timesheet",
@ -124,20 +124,20 @@ erpnext.production_order = {
} }
// opertions // opertions
if ((doc.operations || []).length) { if (((doc.operations || []).length) && frm.doc.status != 'Stopped') {
frm.add_custom_button(__('Timesheet'), function() { frm.add_custom_button(__('Timesheet'), function() {
frappe.route_options = {"production_order": frm.doc.name}; frappe.route_options = {"production_order": frm.doc.name};
frappe.set_route("List", "Timesheet"); frappe.set_route("List", "Timesheet");
}, __("View")); }, __("View"));
} }
if (flt(doc.material_transferred_for_manufacturing) < flt(doc.qty)) { if ((flt(doc.material_transferred_for_manufacturing) < flt(doc.qty)) && frm.doc.status != 'Stopped') {
var btn = frm.add_custom_button(__('Start'), var btn = frm.add_custom_button(__('Start'),
cur_frm.cscript['Transfer Raw Materials']); cur_frm.cscript['Transfer Raw Materials']);
btn.addClass('btn-primary'); btn.addClass('btn-primary');
} }
if (flt(doc.produced_qty) < flt(doc.material_transferred_for_manufacturing)) { if ((flt(doc.produced_qty) < flt(doc.material_transferred_for_manufacturing)) && frm.doc.status != 'Stopped') {
var btn = frm.add_custom_button(__('Finish'), var btn = frm.add_custom_button(__('Finish'),
cur_frm.cscript['Update Finished Goods']); cur_frm.cscript['Update Finished Goods']);

6
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -105,7 +105,7 @@ class ProductionOrder(Document):
def stop_unstop(self, status): def stop_unstop(self, status):
""" Called from client side on Stop/Unstop event""" """ Called from client side on Stop/Unstop event"""
self.update_status(status) status = self.update_status(status)
self.update_planned_qty() self.update_planned_qty()
frappe.msgprint(_("Production Order status is {0}").format(status)) frappe.msgprint(_("Production Order status is {0}").format(status))
self.notify_update() self.notify_update()
@ -114,13 +114,15 @@ class ProductionOrder(Document):
def update_status(self, status=None): def update_status(self, status=None):
'''Update status of production order if unknown''' '''Update status of production order if unknown'''
if not status: if not status:
status = self.get_status() status = self.get_status(status)
if status != self.status: if status != self.status:
self.db_set("status", status) self.db_set("status", status)
self.update_required_items() self.update_required_items()
return status
def get_status(self, status=None): def get_status(self, status=None):
'''Return the status based on stock entries against this production order''' '''Return the status based on stock entries against this production order'''
if not status: if not status: