fix: `shipping_address` in PO
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index ce7de87..e1dd679 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/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
},
@@ -1208,11 +1208,6 @@
"label": "Address & Contact"
},
{
- "fieldname": "company_shipping_address_section",
- "fieldtype": "Section Break",
- "label": "Company Shipping Address"
- },
- {
"fieldname": "company_billing_address_section",
"fieldtype": "Section Break",
"label": "Company Billing Address"
@@ -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",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 0013c95..efe1f8e 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -1031,8 +1031,6 @@
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 @@
"contact_email",
"contact_person",
"taxes_and_charges",
- "shipping_address",
"terms",
],
+ "field_map": [
+ ["shipping_address_name", "shipping_address"],
+ ],
"validation": {"docstatus": ["=", 1]},
},
"Sales Order Item": {