nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41844 from ruthra-kumar/forex_accounts_support_for_advance_accounts

Browse Source 
refactor: allow foreign currency advance accounts
This commit is contained in:
ruthra kumar
2024-06-23 05:26:52 +05:30
committed by GitHub
parent ac6d85aed6 3fabf4aaa4
commit a4c0115b5e
11 changed files with 436 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,53 @@ class CustomerGroup(NestedSet):
def validate(self):
if not self.parent_customer_group:
self.parent_customer_group = get_root_of("Customer Group")
self.validate_currency_for_receivable_and_advance_account()
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
if x.account:
receivable_account_currency = frappe.get_cached_value(
"Account", x.account, "account_currency"
)
if x.advance_account:
advance_account_currency = frappe.get_cached_value(
"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
and receivable_account_currency != advance_account_currency
):
frappe.throw(
_(
"Both Receivable Account: {0} and Advance Account: {1} must be of same currency for company: {2}"
).format(
frappe.bold(x.account),
frappe.bold(x.advance_account),
frappe.bold(x.company),
)
)
def on_update(self):
super().on_update()

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

@@ -3,6 +3,7 @@
import frappe
from frappe import _
from frappe.utils.nestedset import NestedSet, get_root_of
@@ -32,6 +33,51 @@ class SupplierGroup(NestedSet):
def validate(self):
if not self.parent_supplier_group:
self.parent_supplier_group = get_root_of("Supplier Group")
self.validate_currency_for_payable_and_advance_account()
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
if x.account:
payable_account_currency = frappe.get_cached_value("Account", x.account, "account_currency")
if x.advance_account:
advance_account_currency = frappe.get_cached_value(
"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
and payable_account_currency != advance_account_currency
):
frappe.throw(
_(
"Both Payable Account: {0} and Advance Account: {1} must be of same currency for company: {2}"
).format(
frappe.bold(x.account),
frappe.bold(x.advance_account),
frappe.bold(x.company),
)
)
def on_update(self):
NestedSet.on_update(self)