Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: handle bank transaction in foreign currency

Browse Source 
(cherry picked from commit 74a0d6408a2082a2a039cd55547e56206e7c70bd)
This commit is contained in:
ruthra kumar 2023-10-25 09:45:05 +05:30 committed by Mergify
parent e7e5727015
commit b1b157aa19
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
View File

@ -151,7 +151,7 @@ def create_journal_entry_bts(
bank_transaction = frappe.db.get_values( bank_transaction = frappe.db.get_values(
"Bank Transaction", "Bank Transaction",
bank_transaction_name, bank_transaction_name,
fieldname=["name", "deposit", "withdrawal", "bank_account"], fieldname=["name", "deposit", "withdrawal", "bank_account", "currency"],
as_dict=True, as_dict=True,
)[0] )[0]
company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account") company_account = frappe.get_value("Bank Account", bank_transaction.bank_account, "account")
@ -169,10 +169,12 @@ def create_journal_entry_bts(
company_account_currency = frappe.get_cached_value("Account", company_account, "account_currency") company_account_currency = frappe.get_cached_value("Account", company_account, "account_currency")
second_account_currency = frappe.get_cached_value("Account", second_account, "account_currency") second_account_currency = frappe.get_cached_value("Account", second_account, "account_currency")
# determine if multi-currency Journal or not
is_multi_currency = ( is_multi_currency = (
True True
if company_default_currency != company_account_currency if company_default_currency != company_account_currency
or company_default_currency != second_account_currency or company_default_currency != second_account_currency
or company_default_currency != bank_transaction.currency
else False else False
) )
@ -196,11 +198,16 @@ def create_journal_entry_bts(
"cost_center": get_default_cost_center(company), "cost_center": get_default_cost_center(company),
} }
# convert transaction amount to company currency
if is_multi_currency: if is_multi_currency:
exc_rate = get_exchange_rate(company_account_currency, company_default_currency, posting_date) exc_rate = get_exchange_rate(bank_transaction.currency, company_default_currency, posting_date)
withdrawal_in_company_currency = flt(exc_rate * abs(bank_transaction.withdrawal)) withdrawal_in_company_currency = flt(exc_rate * abs(bank_transaction.withdrawal))
deposit_in_company_currency = flt(exc_rate * abs(bank_transaction.deposit)) deposit_in_company_currency = flt(exc_rate * abs(bank_transaction.deposit))
else:
withdrawal_in_company_currency = bank_transaction.withdrawal
deposit_in_company_currency = bank_transaction.deposit
# if second account is of foreign currency, convert and set debit and credit fields.
if second_account_currency != company_default_currency: if second_account_currency != company_default_currency:
exc_rate = get_exchange_rate(second_account_currency, company_default_currency, posting_date) exc_rate = get_exchange_rate(second_account_currency, company_default_currency, posting_date)
second_account_dict.update( second_account_dict.update(
@ -208,6 +215,8 @@ def create_journal_entry_bts(
"exchange_rate": exc_rate, "exchange_rate": exc_rate,
"credit": deposit_in_company_currency, "credit": deposit_in_company_currency,
"debit": withdrawal_in_company_currency, "debit": withdrawal_in_company_currency,
"credit_in_account_currency": flt(deposit_in_company_currency / exc_rate) or 0,
"debit_in_account_currency": flt(withdrawal_in_company_currency / exc_rate) or 0,
} }
) )
else: else:
@ -221,6 +230,7 @@ def create_journal_entry_bts(
} }
) )
# if company account is of foreign currency, convert and set debit and credit fields.
if company_account_currency != company_default_currency: if company_account_currency != company_default_currency:
exc_rate = get_exchange_rate(company_account_currency, company_default_currency, posting_date) exc_rate = get_exchange_rate(company_account_currency, company_default_currency, posting_date)
company_account_dict.update( company_account_dict.update(
@ -230,6 +240,16 @@ def create_journal_entry_bts(
"debit": deposit_in_company_currency, "debit": deposit_in_company_currency,
} }
) )
else:
company_account_dict.update(
{
"exchange_rate": 1,
"credit": withdrawal_in_company_currency,
"debit": deposit_in_company_currency,
"credit_in_account_currency": withdrawal_in_company_currency,
"debit_in_account_currency": deposit_in_company_currency,
}
)
accounts.append(second_account_dict) accounts.append(second_account_dict)
accounts.append(company_account_dict) accounts.append(company_account_dict)