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

Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename

Browse Source
This commit is contained in:
Anand Doshi 2012-05-03 16:27:20 +05:30
commit ee9863cfce
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/selling/doctype/quotation/quotation.js
View File

@ -42,7 +42,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(doc.quotation_to) { if(doc.quotation_to) {
if(doc.quotation_to == 'Customer') { if(doc.quotation_to == 'Customer') {
hide_field(['lead', 'lead_name', 'organization']); hide_field(['lead', 'lead_name']);
} }
else if (doc.quotation_to == 'Lead') { else if (doc.quotation_to == 'Lead') {
hide_field(['customer','customer_address','contact_person', 'customer_name','contact_display', 'customer_group']); hide_field(['customer','customer_address','contact_person', 'customer_name','contact_display', 'customer_group']);
@ -61,11 +61,11 @@ cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
// hide - unhide fields based on lead or customer.. // hide - unhide fields based on lead or customer..
// ======================================================================================================================= // =======================================================================================================================
cur_frm.cscript.lead_cust_show = function(doc,cdt,cdn){ cur_frm.cscript.lead_cust_show = function(doc,cdt,cdn){
hide_field(['lead', 'lead_name','customer','customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group', 'organization']); hide_field(['lead', 'lead_name','customer','customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
if(doc.quotation_to == 'Lead') unhide_field(['lead']); if(doc.quotation_to == 'Lead') unhide_field(['lead']);
else if(doc.quotation_to == 'Customer') unhide_field(['customer']); else if(doc.quotation_to == 'Customer') unhide_field(['customer']);
doc.lead = doc.lead_name = doc.customer = doc.customer_address = doc.contact_person = doc.address_display = doc.contact_display = doc.contact_mobile = doc.contact_email = doc.territory = doc.customer_group = doc.organization = ""; doc.lead = doc.lead_name = doc.customer = doc.customer_name = doc.customer_address = doc.contact_person = doc.address_display = doc.contact_display = doc.contact_mobile = doc.contact_email = doc.territory = doc.customer_group = "";
} }
@ -144,8 +144,10 @@ cur_frm.fields_dict['lead'].get_query = function(doc,cdt,cdn){
} }
cur_frm.cscript.lead = function(doc, cdt, cdn) { cur_frm.cscript.lead = function(doc, cdt, cdn) {
if(doc.lead) get_server_fields('get_lead_details', doc.lead,'', doc, cdt, cdn, 1); if(doc.lead) {
if(doc.lead) unhide_field('territory'); get_server_fields('get_lead_details', doc.lead,'', doc, cdt, cdn, 1, callback);
unhide_field('territory');
}
} }