fix: `shipping_address` for non-drop shipping item
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index efe1f8e..7c0601e 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -1024,6 +1024,15 @@
]
items_to_map = list(set(items_to_map))
+ def is_drop_ship_order(target):
+ drop_ship = True
+ for item in target.items:
+ if not item.delivered_by_supplier:
+ drop_ship = False
+ break
+
+ return drop_ship
+
def set_missing_values(source, target):
target.supplier = ""
target.apply_discount_on = ""
@@ -1031,6 +1040,14 @@
target.discount_amount = 0.0
target.inter_company_order_reference = ""
target.shipping_rule = ""
+
+ if is_drop_ship_order(target):
+ target.customer = source.customer
+ target.customer_name = source.customer_name
+ target.shipping_address = source.shipping_address_name
+ else:
+ target.customer = target.customer_name = target.shipping_address = None
+
target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals")
@@ -1057,11 +1074,9 @@
"contact_email",
"contact_person",
"taxes_and_charges",
+ "shipping_address",
"terms",
],
- "field_map": [
- ["shipping_address_name", "shipping_address"],
- ],
"validation": {"docstatus": ["=", 1]},
},
"Sales Order Item": {