From 3ca55ceb75f9890e1a46fd9c75bad17de9798b4f Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:24:40 +0200 Subject: [PATCH] fix: use correct variable in error message (#43790) --- erpnext/controllers/accounts_controller.py | 8 +++----- erpnext/locale/tr.po | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 2c96d4ac398..9063962bc78 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -354,16 +354,14 @@ class AccountsController(TransactionBase): 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), ) ) diff --git a/erpnext/locale/tr.po b/erpnext/locale/tr.po index 05d5911427a..88966424f5f 100644 --- a/erpnext/locale/tr.po +++ b/erpnext/locale/tr.po @@ -42529,7 +42529,7 @@ msgstr "Red Deposu" #: erpnext/public/js/utils/serial_no_batch_selector.js:637 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." -msgstr "" +msgstr "Red Deposu ile Kabul Deposu aynı olamaz." #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:19 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:14 -- GitLab