fix(Delivery Note): translatability of validation errors
This commit is contained in:
@@ -361,52 +361,42 @@ class DeliveryNote(SellingController):
|
|||||||
self.validate_sales_invoice_references()
|
self.validate_sales_invoice_references()
|
||||||
|
|
||||||
def validate_sales_order_references(self):
|
def validate_sales_order_references(self):
|
||||||
err_msg = ""
|
errors = []
|
||||||
for item in self.items:
|
for item in self.items:
|
||||||
if (item.against_sales_order and not item.so_detail) or (
|
missing_label = None
|
||||||
not item.against_sales_order and item.so_detail
|
if item.against_sales_order and not item.so_detail:
|
||||||
):
|
missing_label = item.meta.get_label("so_detail")
|
||||||
if not item.against_sales_order:
|
elif item.so_detail and not item.against_sales_order:
|
||||||
err_msg += (
|
missing_label = item.meta.get_label("against_sales_order")
|
||||||
_("'Sales Order' reference ({1}) is missing in row {0}").format(
|
|
||||||
frappe.bold(item.idx), frappe.bold("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)
|
||||||
)
|
)
|
||||||
+ "<br>"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
err_msg += (
|
|
||||||
_("'Sales Order Item' reference ({1}) is missing in row {0}").format(
|
|
||||||
frappe.bold(item.idx), frappe.bold("so_detail")
|
|
||||||
)
|
|
||||||
+ "<br>"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if err_msg:
|
if errors:
|
||||||
frappe.throw(err_msg, title=_("References to Sales Orders are Incomplete"))
|
frappe.throw("<br>".join(errors), title=_("References to Sales Orders are Incomplete"))
|
||||||
|
|
||||||
def validate_sales_invoice_references(self):
|
def validate_sales_invoice_references(self):
|
||||||
err_msg = ""
|
errors = []
|
||||||
for item in self.items:
|
for item in self.items:
|
||||||
if (item.against_sales_invoice and not item.si_detail) or (
|
missing_label = None
|
||||||
not item.against_sales_invoice and item.si_detail
|
if item.against_sales_invoice and not item.si_detail:
|
||||||
):
|
missing_label = item.meta.get_label("si_detail")
|
||||||
if not item.against_sales_invoice:
|
elif item.si_detail and not item.against_sales_invoice:
|
||||||
err_msg += (
|
missing_label = item.meta.get_label("against_sales_invoice")
|
||||||
_("'Sales Invoice' reference ({1}) is missing in row {0}").format(
|
|
||||||
frappe.bold(item.idx), frappe.bold("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)
|
||||||
)
|
)
|
||||||
+ "<br>"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
err_msg += (
|
|
||||||
_("'Sales Invoice Item' reference ({1}) is missing in row {0}").format(
|
|
||||||
frappe.bold(item.idx), frappe.bold("si_detail")
|
|
||||||
)
|
|
||||||
+ "<br>"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if err_msg:
|
if errors:
|
||||||
frappe.throw(err_msg, title=_("References to Sales Invoices are Incomplete"))
|
frappe.throw("<br>".join(errors), title=_("References to Sales Invoices are Incomplete"))
|
||||||
|
|
||||||
def validate_proj_cust(self):
|
def validate_proj_cust(self):
|
||||||
"""check for does customer belong to same project as entered.."""
|
"""check for does customer belong to same project as entered.."""
|
||||||
|
|||||||
Reference in New Issue
Block a user