diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index f4089be20f6..0d67fd3e071 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -37,7 +37,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
 	// load default charges
 	
 	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']);
+		hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
 	}
 }
 
@@ -100,7 +100,7 @@ cur_frm.cscript.customer = function(doc,dt,dn) {
 	var callback = function(r,rt) {
 		var callback2  = function(r, rt) {
 
-			if(doc.customer) unhide_field(['customer_address', 'contact_person', 'territory','customer_group','shipping_address']);
+			if(doc.customer) unhide_field(['customer_address', 'contact_person', 'territory','customer_group']);
 			cur_frm.refresh();
 			
 			if(!onload && (pl != doc.price_list_name)) cur_frm.cscript.price_list_name(doc, dt, dn);
@@ -141,8 +141,8 @@ cur_frm.cscript.pull_quotation_details = function(doc,dt,dn) {
 		if(r.message){							
 			doc.quotation_no = r.message;			
 			if(doc.quotation_no) {					
-					unhide_field(['quotation_date','customer_address','contact_person','territory','customer_group','shipping_address']);									
-					if(doc.customer) get_server_fields('get_shipping_address',doc.customer,'',doc, dt, dn, 0);
+				unhide_field(['quotation_date', 'customer_address', 'contact_person', 'territory', 'customer_group']);
+				if(doc.customer) get_server_fields('get_shipping_address', doc.customer, '', doc, dt, dn, 0);
 			}			
 			cur_frm.refresh();
 		}