From a01869bb20fffeae412237518682f920d98978cb Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Tue, 21 May 2019 15:41:05 +0530 Subject: [PATCH] style: refactor --- erpnext/selling/doctype/sales_order/sales_order.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index ae34dc9c4fa..6cdb4f88840 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -140,12 +140,15 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } // delivery note - if(flt(doc.per_delivered, 6) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && allow_delivery) { + if(flt(doc.per_delivered, 6) < 100 && allow_delivery) { this.frm.add_custom_button(__('Delivery'), function() { me.make_delivery_note_based_on_delivery_date(); }, __("Make")); - this.frm.add_custom_button(__('Work Order'), - function() { me.make_work_order() }, __("Make")); + if(["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1){ + this.frm.add_custom_button(__('Work Order'), + function() { me.make_work_order() }, __("Make")); + + } this.frm.page.set_inner_btn_group_as_primary(__("Make")); } @@ -181,8 +184,6 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( // maintenance if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) { - this.frm.add_custom_button(__('Delivery'), - function() { me.make_delivery_note_based_on_delivery_date(); }, __("Make")); this.frm.add_custom_button(__('Maintenance Visit'), function() { me.make_maintenance_visit() }, __("Make")); this.frm.add_custom_button(__('Maintenance Schedule'),