From 31e0eacb7a15825fbe22dba127fb44209ede449e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 19 Mar 2012 18:54:11 +0530 Subject: [PATCH] Update erpnext/selling/doctype/sales_order/sales_order.js --- erpnext/selling/doctype/sales_order/sales_order.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index ba899f9659..3e0d783621 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -35,7 +35,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { if(!doc.price_list_currency) set_multiple(cdt, cdn, {price_list_currency: doc.currency, plc_conversion_rate: 1}); // load default charges - if(doc.__islocal){ + if(doc.__islocal && !doc.customer){ hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group','shipping_address']); } } @@ -100,10 +100,13 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { //customer cur_frm.cscript.customer = function(doc,dt,dn) { var callback = function(r,rt) { - var doc = locals[cur_frm.doctype][cur_frm.docname]; - get_server_fields('get_shipping_address',doc.customer,'',doc, dt, dn, 0); + var callback2 = function(r, rt) { if(doc.customer) unhide_field(['customer_address', 'contact_person', 'customer_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email', 'territory','customer_group','shipping_address']); cur_frm.refresh(); + } + var doc = locals[cur_frm.doctype][cur_frm.docname]; + get_server_fields('get_shipping_address',doc.customer,'',doc, dt, dn, 0, callback2); + } if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_address', '', callback);