From ea4f7365ea8e6dc48af50369c2239b2ba665ab5e Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Sat, 17 Aug 2024 02:27:36 +0200
Subject: [PATCH] fix(Delivery Note): translatability of validation errors
(cherry picked from commit 34df6e39dcca685b6b107c5f0631721d7156768c)
---
.../doctype/delivery_note/delivery_note.py | 66 ++++++++-----------
1 file changed, 28 insertions(+), 38 deletions(-)
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 847a57baa726..d2d10cd99358 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -362,52 +362,42 @@ def validate_references(self):
self.validate_sales_invoice_references()
def validate_sales_order_references(self):
- err_msg = ""
+ errors = []
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")
- )
- + "
"
+ missing_label = None
+ if item.against_sales_order and not item.so_detail:
+ missing_label = item.meta.get_label("so_detail")
+ elif item.so_detail and not item.against_sales_order:
+ missing_label = item.meta.get_label("against_sales_order")
+
+ 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 Orders are Incomplete"))
+ if errors:
+ frappe.throw("
".join(errors), title=_("References to Sales Orders are Incomplete"))
def validate_sales_invoice_references(self):
- err_msg = ""
+ 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.against_sales_invoice and not item.si_detail:
+ missing_label = item.meta.get_label("si_detail")
+ elif item.si_detail and not item.against_sales_invoice:
+ missing_label = item.meta.get_label("against_sales_invoice")
+
+ 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=_("References to Sales Invoices are Incomplete"))
def validate_proj_cust(self):
"""check for does customer belong to same project as entered.."""