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

Merge pull request #3 from nabinhait/master

Browse Source 
"Make next document" hide/unhide issue in SO/DN
This commit is contained in:
Nabin Hait 2011-06-09 04:47:53 -07:00
commit 54c93bf825
2 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crm/doctype/sales_order/sales_order.js
View File

@ -21,8 +21,6 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(doc.__islocal){ if(doc.__islocal){
hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group','shipping_address']); hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group','shipping_address']);
} }
} }
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) { cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
@ -33,33 +31,20 @@ cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
} }
} }
// REFRESH // Refresh
// ================================================================================================ //==================
cur_frm.cscript.get_open_status = function(doc) {
var open_delivery = 0; var open_invoicing=0;
var ch = getchildren('Sales Order Detail',doc.name,'sales_order_details');
for(var i in ch){
if(ch[i].qty > ch[i].delivered_qty) open_delivery = 1;
if(ch[i].qty > ch[i].billed_qty) open_invoicing = 1;
if(ch[i].amount > ch[i].billed_amt) open_invoicing = 1;
}
return [open_delivery, open_invoicing];
}
cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.clear_custom_buttons(); cur_frm.clear_custom_buttons();
var open_status = cur_frm.cscript.get_open_status(doc);
if(doc.docstatus==1) { if(doc.docstatus==1) {
if(doc.status != 'Stopped') { if(doc.status != 'Stopped') {
cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']); cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']);
// delivery note // delivery note
if(open_status[0] && doc.order_type!='Maintenance') if(doc.per_delivered < 100 && doc.order_type!='Maintenance')
cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']); cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']);
// maintenance // maintenance
if(open_status[0] && doc.order_type=='Maintenance') { if(doc.per_delivered < 100 && doc.order_type=='Maintenance') {
cur_frm.add_custom_button('Make Maint. Visit', cur_frm.cscript['Make Maintenance Visit']); cur_frm.add_custom_button('Make Maint. Visit', cur_frm.cscript['Make Maintenance Visit']);
cur_frm.add_custom_button('Make Maint. Schedule', cur_frm.cscript['Make Maintenance Schedule']); cur_frm.add_custom_button('Make Maint. Schedule', cur_frm.cscript['Make Maintenance Schedule']);
} }
@ -69,11 +54,11 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.add_custom_button('Make Indent', cur_frm.cscript['Make Indent']); cur_frm.add_custom_button('Make Indent', cur_frm.cscript['Make Indent']);
// sales invoice // sales invoice
if(open_status[1]) if(doc.per_billed < 100)
cur_frm.add_custom_button('Make Invoice', cur_frm.cscript['Make Sales Invoice']); cur_frm.add_custom_button('Make Invoice', cur_frm.cscript['Make Sales Invoice']);
// stop // stop
if(open_status[0] || open_status[1]) if(doc.per_delivered < 100 || doc.per_billed < 100)
cur_frm.add_custom_button('Stop!', cur_frm.cscript['Stop Sales Order']); cur_frm.add_custom_button('Stop!', cur_frm.cscript['Stop Sales Order']);
} else { } else {

14
material_management/doctype/delivery_note/delivery_note.js
View File

@ -36,19 +36,9 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.clear_custom_buttons(); cur_frm.clear_custom_buttons();
var ch = getchildren('Delivery Note Detail',doc.name,'delivery_note_details'); if(doc.per_billed < 100 && doc.docstatus==1) cur_frm.add_custom_button('Make Invoice', cur_frm.cscript['Make Sales Invoice']);
var is_billed = 1; // assume all qty's are billed
var is_installed = 1; //assume all qty's are installed
for(var i in ch){ if(doc.per_installed < 100 && doc.docstatus==1) cur_frm.add_custom_button('Make Installation Note', cur_frm.cscript['Make Installation Note']);
if(ch[i].billed_qty < ch[i].qty) is_billed = 0;
if(ch[i].installed_qty < ch[i].qty) is_installed = 0;
if(ch[i].billed_amt < ch[i].amount) is_billed = 0;
}
if(is_billed==0 && doc.docstatus==1) cur_frm.add_custom_button('Make Invoice', cur_frm.cscript['Make Sales Invoice']);
if(is_installed==0 && doc.docstatus==1) cur_frm.add_custom_button('Make Installation Note', cur_frm.cscript['Make Installation Note']);
if (doc.docstatus!=1) { if (doc.docstatus!=1) {
hide_field(['SMS', 'Send SMS', 'message', 'customer_mobile_no', 'Repair Delivery Note']); hide_field(['SMS', 'Send SMS', 'message', 'customer_mobile_no', 'Repair Delivery Note']);