diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 634ae933a8e7b4a1f91f368370ba0159f5bce7a4..2c96d4ac3980445289bc81ce952c46fc8a4a0b04 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -354,12 +354,17 @@ 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 = "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) - if frappe.get_value(self.doctype, self.return_against, cr_dr_account_field) != cr_dr_account: + original_account = frappe.get_value(self.doctype, self.return_against, cr_dr_account_field) + if original_account != cr_dr_account: frappe.throw( - _("'{0}' account: '{1}' should match the Return Against Invoice").format( - frappe.bold(cr_dr_account_label), frappe.bold(cr_dr_account) + _( + "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.return_against), ) )