CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 23:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42783 from frappe/mergify/bp/version-15-hotfix/pr-42774

Browse Source 
refactor: Loosen account currency validation on groups (backport #42774)
This commit is contained in:
ruthra kumar
2024-08-16 10:41:56 +05:30
committed by GitHub
parent aba54ba18f b2e108afcc
commit 3be037221a
2 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/setup/doctype/customer_group/customer_group.py
View File

@@ -42,7 +42,6 @@ class CustomerGroup(NestedSet):
def validate_currency_for_receivable_and_advance_account(self):
for x in self.accounts:
company_default_currency = frappe.get_cached_value("Company", x.company, "default_currency")
receivable_account_currency = None
advance_account_currency = None
@@ -56,21 +55,6 @@ class CustomerGroup(NestedSet):
"Account", x.advance_account, "account_currency"
)
if receivable_account_currency and receivable_account_currency != company_default_currency:
frappe.throw(
_("Receivable Account: {0} must be in Company default currency: {1}").format(
frappe.bold(x.account),
frappe.bold(company_default_currency),
)
)
if advance_account_currency and advance_account_currency != company_default_currency:
frappe.throw(
_("Advance Account: {0} must be in Company default currency: {1}").format(
frappe.bold(x.advance_account), frappe.bold(company_default_currency)
)
)
if (
receivable_account_currency
and advance_account_currency

16
erpnext/setup/doctype/supplier_group/supplier_group.py
View File

@@ -37,7 +37,6 @@ class SupplierGroup(NestedSet):
def validate_currency_for_payable_and_advance_account(self):
for x in self.accounts:
company_default_currency = frappe.get_cached_value("Company", x.company, "default_currency")
payable_account_currency = None
advance_account_currency = None
@@ -49,21 +48,6 @@ class SupplierGroup(NestedSet):
"Account", x.advance_account, "account_currency"
)
if payable_account_currency and payable_account_currency != company_default_currency:
frappe.throw(
_("Payable Account: {0} must be in Company default currency: {1}").format(
frappe.bold(x.account),
frappe.bold(company_default_currency),
)
)
if advance_account_currency and advance_account_currency != company_default_currency:
frappe.throw(
_("Advance Account: {0} must be in Company default currency: {1}").format(
frappe.bold(x.advance_account), frappe.bold(company_default_currency)
)
)
if (
payable_account_currency
and advance_account_currency