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

refactor: update exchange rate import to avoid redundancy

Browse Source
This commit is contained in:
ljain112
2025-10-09 13:11:10 +05:30
parent 004bd59245
commit 610877fb17
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@@ -33,6 +33,7 @@ from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_sched
get_depr_schedule, get_depr_schedule,
) )
from erpnext.controllers.accounts_controller import AccountsController from erpnext.controllers.accounts_controller import AccountsController
from erpnext.setup.utils import get_exchange_rate as _get_exchange_rate
class StockAccountInvalidTransaction(frappe.ValidationError): class StockAccountInvalidTransaction(frappe.ValidationError):
@@ -354,7 +355,6 @@ class JournalEntry(AccountsController):
def apply_tax_withholding(self): def apply_tax_withholding(self):
from erpnext.accounts.report.general_ledger.general_ledger import get_account_type_map from erpnext.accounts.report.general_ledger.general_ledger import get_account_type_map
from erpnext.setup.utils import get_exchange_rate
if not self.apply_tds or self.voucher_type not in ("Debit Note", "Credit Note"): if not self.apply_tds or self.voucher_type not in ("Debit Note", "Credit Note"):
return return
@@ -421,7 +421,7 @@ class JournalEntry(AccountsController):
acc_curr = get_account_currency(tax_acc) acc_curr = get_account_currency(tax_acc)
comp_curr = frappe.get_cached_value("Company", self.company, "default_currency") comp_curr = frappe.get_cached_value("Company", self.company, "default_currency")
exch_rate = get_exchange_rate(acc_curr, comp_curr, self.posting_date) exch_rate = _get_exchange_rate(acc_curr, comp_curr, self.posting_date)
tax_amt_in_comp_curr = flt(tax_details.get("tax_amount"), precision) tax_amt_in_comp_curr = flt(tax_details.get("tax_amount"), precision)
tax_amt_in_acc_curr = flt(tax_amt_in_comp_curr / exch_rate, precision) tax_amt_in_acc_curr = flt(tax_amt_in_comp_curr / exch_rate, precision)
@@ -1808,8 +1808,6 @@ def get_exchange_rate(
credit=None, credit=None,
exchange_rate=None, exchange_rate=None,
): ):
from erpnext.setup.utils import get_exchange_rate
account_details = frappe.get_cached_value( account_details = frappe.get_cached_value(
"Account", account, ["account_type", "root_type", "account_currency", "company"], as_dict=1 "Account", account, ["account_type", "root_type", "account_currency", "company"], as_dict=1
) )
@@ -1832,7 +1830,7 @@ def get_exchange_rate(
# The date used to retreive the exchange rate here is the date passed # The date used to retreive the exchange rate here is the date passed
# in as an argument to this function. # in as an argument to this function.
elif (not exchange_rate or flt(exchange_rate) == 1) and account_currency and posting_date: elif (not exchange_rate or flt(exchange_rate) == 1) and account_currency and posting_date:
exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date) exchange_rate = _get_exchange_rate(account_currency, company_currency, posting_date)
else: else:
exchange_rate = 1 exchange_rate = 1