From 18a75fef9acaa9714512dc08d3bb7b8db8b267ab Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 26 Aug 2024 14:05:19 +0530 Subject: [PATCH] refactor: better err msg on clearance tool (cherry picked from commit 092411b54ff21d5bed74eb896b8d6bf7bc0d0ad9) # Conflicts: # erpnext/accounts/doctype/bank_clearance/bank_clearance.py --- .../doctype/bank_clearance/bank_clearance.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py index 6445deba6c3..dd0b6bf812e 100644 --- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py +++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py @@ -6,7 +6,12 @@ import frappe from frappe import _, msgprint from frappe.model.document import Document from frappe.query_builder.custom import ConstantColumn +<<<<<<< HEAD from frappe.utils import flt, fmt_money, getdate +======= +from frappe.utils import flt, fmt_money, get_link_to_form, getdate +from pypika import Order +>>>>>>> 092411b54f (refactor: better err msg on clearance tool) import erpnext @@ -210,8 +215,11 @@ class BankClearance(Document): if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date): frappe.throw( - _("Row #{0}: Clearance date {1} cannot be before Cheque Date {2}").format( - d.idx, d.clearance_date, d.cheque_date + _("Row #{0}: For {1} Clearance date {2} cannot be before Cheque Date {3}").format( + d.idx, + get_link_to_form(d.payment_document, d.payment_entry), + d.clearance_date, + d.cheque_date, ) )