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

Merge pull request #41086 from ruthra-kumar/prevent_multi_currency_advance_in_separate_party

Browse Source 
fix: prevent foreign currency  accounts as advance accounts.
This commit is contained in:
ruthra kumar
2024-04-23 07:14:16 +05:30
committed by GitHub
parent 7286df86c5 1ad065fc54
commit 3e7ccb24a6
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -158,6 +158,7 @@ class PaymentEntry(AccountsController):
self.setup_party_account_field() self.setup_party_account_field()
self.set_missing_values() self.set_missing_values()
self.set_liability_account() self.set_liability_account()
self.validate_advance_account_currency()
self.set_missing_ref_details(force=True) self.set_missing_ref_details(force=True)
self.validate_payment_type() self.validate_payment_type()
self.validate_party_details() self.validate_party_details()
@@ -240,6 +241,22 @@ class PaymentEntry(AccountsController):
alert=True, alert=True,
) )
def validate_advance_account_currency(self):
if self.book_advance_payments_in_separate_party_account is True:
company_currency = frappe.get_cached_value("Company", self.company, "default_currency")
if self.payment_type == "Receive" and self.paid_from_account_currency != company_currency:
frappe.throw(
_("Booking advances in foreign currency account: {0} ({1}) is not yet supported.").format(
frappe.bold(self.paid_from), frappe.bold(self.paid_from_account_currency)
)
)
if self.payment_type == "Pay" and self.paid_to_account_currency != company_currency:
frappe.throw(
_("Booking advances in foreign currency account: {0} ({1}) is not yet supported.").format(
frappe.bold(self.paid_to), frappe.bold(self.paid_to_account_currency)
)
)
def on_cancel(self): def on_cancel(self):
self.ignore_linked_doctypes = ( self.ignore_linked_doctypes = (
"GL Entry", "GL Entry",

24
erpnext/setup/doctype/company/company.py
View File

@@ -139,6 +139,7 @@ class Company(NestedSet):
self.validate_abbr() self.validate_abbr()
self.validate_default_accounts() self.validate_default_accounts()
self.validate_currency() self.validate_currency()
self.validate_advance_account_currency()
self.validate_coa_input() self.validate_coa_input()
self.validate_perpetual_inventory() self.validate_perpetual_inventory()
self.validate_provisional_account_for_non_stock_items() self.validate_provisional_account_for_non_stock_items()
@@ -191,6 +192,29 @@ class Company(NestedSet):
).format(frappe.bold(account[0])) ).format(frappe.bold(account[0]))
frappe.throw(error_message) frappe.throw(error_message)
def validate_advance_account_currency(self):
if (
self.default_advance_received_account
and frappe.get_cached_value("Account", self.default_advance_received_account, "account_currency")
!= self.default_currency
):
frappe.throw(
_("'{0}' should be in company currency {1}.").format(
frappe.bold("Default Advance Received Account"), frappe.bold(self.default_currency)
)
)
if (
self.default_advance_paid_account
and frappe.get_cached_value("Account", self.default_advance_paid_account, "account_currency")
!= self.default_currency
):
frappe.throw(
_("'{0}' should be in company currency {1}.").format(
frappe.bold("Default Advance Paid Account"), frappe.bold(self.default_currency)
)
)
def validate_currency(self): def validate_currency(self):
if self.is_new(): if self.is_new():
return return