Merge pull request #33434 from s-aga-r/fix/github-issue/32258

fix(ux): `shipping_address` in PO

erpnext/buying/doctype/purchase_order/purchase_order.json

@@ -108,7 +108,7 @@
   "contact_display",
   "contact_mobile",
   "contact_email",
-  "company_shipping_address_section",
+  "shipping_address_section",
   "shipping_address",
   "column_break_99",
   "shipping_address_display",
@@ -385,7 +385,7 @@
   {
    "fieldname": "shipping_address",
    "fieldtype": "Link",
-   "label": "Company Shipping Address",
+   "label": "Shipping Address",
    "options": "Address",
    "print_hide": 1
   },
@@ -1207,11 +1207,6 @@
    "fieldtype": "Tab Break",
    "label": "Address & Contact"
   },
-  {
-   "fieldname": "company_shipping_address_section",
-   "fieldtype": "Section Break",
-   "label": "Company Shipping Address"
-  },
   {
    "fieldname": "company_billing_address_section",
    "fieldtype": "Section Break",
@@ -1263,13 +1258,18 @@
    "fieldname": "named_place",
    "fieldtype": "Data",
    "label": "Named Place"
+  },
+  {
+   "fieldname": "shipping_address_section",
+   "fieldtype": "Section Break",
+   "label": "Shipping Address"
   }
  ],
  "icon": "fa fa-file-text",
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-12-12 18:36:37.455134",
+ "modified": "2022-12-25 18:08:59.074182",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",

erpnext/selling/doctype/sales_order/sales_order.py

@@ -1031,8 +1031,6 @@ def set_missing_values(source, target):
 		target.discount_amount = 0.0
 		target.inter_company_order_reference = ""
 		target.shipping_rule = ""
-		target.customer = ""
-		target.customer_name = ""
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")
 
@@ -1059,9 +1057,11 @@ def update_item_for_packed_item(source, target, source_parent):
 					"contact_email",
 					"contact_person",
 					"taxes_and_charges",
-					"shipping_address",
 					"terms",
 				],
+				"field_map": [
+					["shipping_address_name", "shipping_address"],
+				],
 				"validation": {"docstatus": ["=", 1]},
 			},
 			"Sales Order Item": {