From 879b2b778a6421c62b977cac82f9568da172ed04 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 19:43:16 +0200 Subject: [PATCH] fix: use correct variable in error message (backport #43790) (#43792) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> fix: use correct variable in error message (#43790) --- erpnext/controllers/accounts_controller.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 21adab8bc1e0..188cbf0587c3 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -393,16 +393,14 @@ def remove_serial_and_batch_bundle(self): def validate_return_against_account(self): if self.doctype in ["Sales Invoice", "Purchase Invoice"] and self.is_return and self.return_against: cr_dr_account_field = "debit_to" if self.doctype == "Sales Invoice" else "credit_to" - cr_dr_account_label = self.meta.get_label(cr_dr_account_field) - cr_dr_account = self.get(cr_dr_account_field) original_account = frappe.get_value(self.doctype, self.return_against, cr_dr_account_field) - if original_account != cr_dr_account: + if original_account != self.get(cr_dr_account_field): frappe.throw( _( "Please set {0} to {1}, the same account that was used in the original invoice {2}." ).format( - frappe.bold(_(cr_dr_account_label, context=self.doctype)), - frappe.bold(cr_dr_account), + frappe.bold(_(self.meta.get_label(cr_dr_account_field), context=self.doctype)), + frappe.bold(original_account), frappe.bold(self.return_against), ) )