nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: translate display text passed to validate_expense_account (#43057)

Browse Source
This commit is contained in:
Raffael Meyer
2024-10-03 21:18:51 +01:00
committed by GitHub
parent b24722e60f
commit 4912288433
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -591,7 +591,7 @@ class PurchaseInvoice(BuyingController):
def validate_expense_account(self): def validate_expense_account(self):
for item in self.get("items"): for item in self.get("items"):
validate_account_head(item.idx, item.expense_account, self.company, "Expense") validate_account_head(item.idx, item.expense_account, self.company, _("Expense"))
def set_against_expense_account(self, force=False): def set_against_expense_account(self, force=False):
against_accounts = [] against_accounts = []

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -376,7 +376,7 @@ class SalesInvoice(SellingController):
def validate_income_account(self): def validate_income_account(self):
for item in self.get("items"): for item in self.get("items"):
validate_account_head(item.idx, item.income_account, self.company, "Income") validate_account_head(item.idx, item.income_account, self.company, _("Income"))
def set_tax_withholding(self): def set_tax_withholding(self):
if self.get("is_opening") == "Yes": if self.get("is_opening") == "Yes":

2
erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
View File

@@ -69,7 +69,7 @@ def valdiate_taxes_and_charges_template(doc):
for tax in doc.get("taxes"): for tax in doc.get("taxes"):
validate_taxes_and_charges(tax) validate_taxes_and_charges(tax)
validate_account_head(tax.idx, tax.account_head, doc.company) validate_account_head(tax.idx, tax.account_head, doc.company, _("Taxes and Charges"))
validate_cost_center(tax, doc) validate_cost_center(tax, doc)
validate_inclusive_tax(tax, doc) validate_inclusive_tax(tax, doc)

6
erpnext/accounts/party.py
View File

@@ -563,9 +563,11 @@ def validate_party_accounts(doc):
# validate if account is mapped for same company # validate if account is mapped for same company
if account.account: if account.account:
validate_account_head(account.idx, account.account, account.company) validate_account_head(account.idx, account.account, account.company, _("Debtor/Creditor"))
if account.advance_account: if account.advance_account:
validate_account_head(account.idx, account.advance_account, account.company) validate_account_head(
account.idx, account.advance_account, account.company, _("Debtor/Creditor Advance")
)
@frappe.whitelist() @frappe.whitelist()

18
erpnext/controllers/accounts_controller.py
View File

@@ -2643,21 +2643,21 @@ def validate_taxes_and_charges(tax):
tax.rate = None tax.rate = None
def validate_account_head(idx, account, company, context=""): def validate_account_head(idx: int, account: str, company: str, context: str | None = None) -> None:
account_company = frappe.get_cached_value("Account", account, "company") """Throw a ValidationError if the account belongs to a different company or is a group account."""
is_group = frappe.get_cached_value("Account", account, "is_group") if company != frappe.get_cached_value("Account", account, "company"):
if account_company != company:
frappe.throw( frappe.throw(
_("Row {0}: {3} Account {1} does not belong to Company {2}").format( _("Row {0}: The {3} Account {1} does not belong to the company {2}").format(
idx, frappe.bold(account), frappe.bold(company), context idx, frappe.bold(account), frappe.bold(company), context or ""
), ),
title=_("Invalid Account"), title=_("Invalid Account"),
) )
if is_group: if frappe.get_cached_value("Account", account, "is_group"):
frappe.throw( frappe.throw(
_("Row {0}: Account {1} is a Group Account").format(idx, frappe.bold(account)), _(
"You selected the account group {1} as {2} Account in row {0}. Please select a single account."
).format(idx, frappe.bold(account), context or ""),
title=_("Invalid Account"), title=_("Invalid Account"),
) )