diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js
index ded9c447e8..062130a730 100644
--- a/selling/doctype/sales_order/sales_order.js
+++ b/selling/doctype/sales_order/sales_order.js
@@ -79,6 +79,29 @@ cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc
 	if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
 }
 
+cur_frm.fields_dict.shipping_address_name.get_query = cur_frm.fields_dict['customer_address'].get_query;
+
+cur_frm.cscript.shipping_address_name = function() {
+	if(cur_frm.doc.shipping_address_name) {
+		wn.model.with_doc("Address", cur_frm.doc.shipping_address_name, function(name) {
+			var address = wn.model.get_doc("Address", name);
+			
+			var out = $.map(["address_line1", "address_line2", "city"], 
+				function(f) { return address[f]; });
+
+			var state_pincode = $.map(["state", "pincode"], function(f) { return address[f]; }).join(" ");
+			if(state_pincode) out.push(state_pincode);
+			
+			if(address["country"]) out.push(address["country"]);
+			
+			out.concat($.map([["Phone:", address["phone"]], ["Fax:", address["fax"]]], 
+				function(val) { return val[1] ? val.join(" ") : null; }));
+			
+			cur_frm.set_value("shipping_address", out.join("\n"));
+		});
+	}
+};
+
 cur_frm.cscript.pull_quotation_details = function(doc,dt,dn) {
 	var callback = function(r,rt){
 		var doc = locals[cur_frm.doctype][cur_frm.docname];					
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index 02ffae7f02..dcb0306beb 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-05-24 19:29:08", 
+  "creation": "2013-06-18 12:39:59", 
   "docstatus": 0, 
-  "modified": "2013-06-05 18:59:41", 
+  "modified": "2013-06-18 17:49:11", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -236,7 +236,7 @@
   "label": "Shipping Address Name", 
   "options": "Address", 
   "print_hide": 1, 
-  "read_only": 1
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
@@ -962,16 +962,6 @@
   "options": "Sales Team", 
   "print_hide": 1
  }, 
- {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "report": 1, 
-  "role": "Sales Manager", 
-  "submit": 1, 
-  "write": 1
- }, 
  {
   "amend": 1, 
   "cancel": 1, 
@@ -982,16 +972,6 @@
   "submit": 1, 
   "write": 1
  }, 
- {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "report": 1, 
-  "role": "Maintenance Manager", 
-  "submit": 1, 
-  "write": 1
- }, 
  {
   "amend": 1, 
   "cancel": 1,