From 873c2840f002ec91f2f5d6d3ed31bc1e30b7bbe4 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                       | 4 ----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 35d3d351e58..9cc1d3e16f5 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -396,16 +396,14 @@ class AccountsController(TransactionBase):
 	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),
 					)
 				)
diff --git a/erpnext/locale/tr.po b/erpnext/locale/tr.po
index f0dce1ffe55..15f38e03c95 100644
--- a/erpnext/locale/tr.po
+++ b/erpnext/locale/tr.po
@@ -42529,11 +42529,7 @@ msgstr "Red Deposu"
 
 #: erpnext/public/js/utils/serial_no_batch_selector.js:637
 msgid "Rejected Warehouse and Accepted Warehouse cannot be same."
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "Red Deposu ile Kabul Deposu aynı olamaz."
->>>>>>> 6f6c5e6569 (fix: Turkish translations)
 
 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:19
 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:14
-- 
GitLab