nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

BugFix: Sales Order with Order Type as Shopping Cart

Browse Source
This commit is contained in:
Anand Doshi
2014-04-28 13:22:47 +05:30
parent 3b3d55cda2
commit 65f83cbae7
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/doctype/sales_order/sales_order.js
View File

@@ -28,18 +28,18 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
cur_frm.add_custom_button(__('Send SMS'), cur_frm.cscript.send_sms, "icon-mobile-phone"); cur_frm.add_custom_button(__('Send SMS'), cur_frm.cscript.send_sms, "icon-mobile-phone");
// delivery note // delivery note
if(flt(doc.per_delivered, 2) < 100 && doc.order_type=='Sales') if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1)
cur_frm.add_custom_button(__('Make Delivery'), this.make_delivery_note); cur_frm.add_custom_button(__('Make Delivery'), this.make_delivery_note);
// maintenance // maintenance
if(flt(doc.per_delivered, 2) < 100 && (doc.order_type !='Sales')) { if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) {
cur_frm.add_custom_button(__('Make Maint. Visit'), this.make_maintenance_visit); cur_frm.add_custom_button(__('Make Maint. Visit'), this.make_maintenance_visit);
cur_frm.add_custom_button(__('Make Maint. Schedule'), cur_frm.add_custom_button(__('Make Maint. Schedule'),
this.make_maintenance_schedule); this.make_maintenance_schedule);
} }
// indent // indent
if(!doc.order_type || (doc.order_type == 'Sales')) if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1)
cur_frm.add_custom_button(__('Make ') + __('Material Request'), cur_frm.add_custom_button(__('Make ') + __('Material Request'),
this.make_material_request); this.make_material_request);