diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 847a57baa726..5d95e7b66d32 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -362,52 +362,33 @@ def validate_references(self):
self.validate_sales_invoice_references()
def validate_sales_order_references(self):
- err_msg = ""
- for item in self.items:
- if (item.against_sales_order and not item.so_detail) or (
- not item.against_sales_order and item.so_detail
- ):
- if not item.against_sales_order:
- err_msg += (
- _("'Sales Order' reference ({1}) is missing in row {0}").format(
- frappe.bold(item.idx), frappe.bold("against_sales_order")
- )
- + "
"
- )
- else:
- err_msg += (
- _("'Sales Order Item' reference ({1}) is missing in row {0}").format(
- frappe.bold(item.idx), frappe.bold("so_detail")
- )
- + "
"
- )
-
- if err_msg:
- frappe.throw(err_msg, title=_("References to Sales Orders are Incomplete"))
+ self._validate_dependent_item_fields(
+ "against_sales_order", "so_detail", _("References to Sales Orders are Incomplete")
+ )
def validate_sales_invoice_references(self):
- err_msg = ""
+ self._validate_dependent_item_fields(
+ "against_sales_invoice", "si_detail", _("References to Sales Invoices are Incomplete")
+ )
+
+ def _validate_dependent_item_fields(self, field_a: str, field_b: str, error_title: str):
+ errors = []
for item in self.items:
- if (item.against_sales_invoice and not item.si_detail) or (
- not item.against_sales_invoice and item.si_detail
- ):
- if not item.against_sales_invoice:
- err_msg += (
- _("'Sales Invoice' reference ({1}) is missing in row {0}").format(
- frappe.bold(item.idx), frappe.bold("against_sales_invoice")
- )
- + "
"
- )
- else:
- err_msg += (
- _("'Sales Invoice Item' reference ({1}) is missing in row {0}").format(
- frappe.bold(item.idx), frappe.bold("si_detail")
- )
- + "
"
+ missing_label = None
+ if item.get(field_a) and not item.get(field_b):
+ missing_label = item.meta.get_label(field_b)
+ elif item.get(field_b) and not item.get(field_a):
+ missing_label = item.meta.get_label(field_a)
+
+ if missing_label and missing_label != "No Label":
+ errors.append(
+ _("The field {0} in row {1} is not set").format(
+ frappe.bold(_(missing_label)), frappe.bold(item.idx)
)
+ )
- if err_msg:
- frappe.throw(err_msg, title=_("References to Sales Invoices are Incomplete"))
+ if errors:
+ frappe.throw("
".join(errors), title=error_title)
def validate_proj_cust(self):
"""check for does customer belong to same project as entered.."""