From b866fcf14f46b0053bc20bb943e1dc3ced8ab35a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 8 Jul 2017 12:57:13 +0530 Subject: [PATCH] Finish prod order when skipped material transfer --- .../doctype/production_order/production_order.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js index a988112bedf..f6d9eafdaba 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.js +++ b/erpnext/manufacturing/doctype/production_order/production_order.js @@ -265,7 +265,7 @@ erpnext.production_order = { erpnext.production_order.stop_production_order(frm, "Resumed"); }, __("Status")); } - + if(!frm.doc.skip_transfer){ if ((flt(doc.material_transferred_for_manufacturing) < flt(doc.qty)) && frm.doc.status != 'Stopped') { @@ -274,7 +274,7 @@ erpnext.production_order = { erpnext.production_order.make_se(frm, 'Material Transfer for Manufacture'); }); start_btn.addClass('btn-primary'); - } + } } if(!frm.doc.skip_transfer){ @@ -293,8 +293,9 @@ erpnext.production_order = { } else { if ((flt(doc.produced_qty) < flt(doc.qty)) && frm.doc.status != 'Stopped') { frm.has_finish_btn = true; - var finish_btn = frm.add_custom_button(__('Finish'), - cur_frm.cscript['Update Finished Goods']); + var finish_btn = frm.add_custom_button(__('Finish'), function() { + erpnext.production_order.make_se(frm, 'Manufacture'); + }); finish_btn.addClass('btn-primary'); } }