schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Get Entries not showing accounts with no gain or loss in Exchange Rate Revaluation issue

Browse Source 
(cherry picked from commit 6de6f55b39)
This commit is contained in:
Vishakh Desai
2024-09-28 12:48:14 +05:30
committed by Mergify
parent 5004b8fbc9
commit 1fe534290d
1 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
View File

@@ -74,6 +74,21 @@ class ExchangeRateRevaluation(Document):
if not (self.company and self.posting_date): if not (self.company and self.posting_date):
frappe.throw(_("Please select Company and Posting Date to getting entries")) frappe.throw(_("Please select Company and Posting Date to getting entries"))
def on_submit(self):
self.remove_accounts_without_gain_loss()
def remove_accounts_without_gain_loss(self):
self.accounts = [account for account in self.accounts if account.gain_loss]
if not self.accounts:
frappe.throw(_("At least one account with exchange gain or loss is required"))
frappe.msgprint(
_("Removing rows without exchange gain or loss"),
alert=True,
indicator="yellow",
)
def on_cancel(self): def on_cancel(self):
self.ignore_linked_doctypes = "GL Entry" self.ignore_linked_doctypes = "GL Entry"
@@ -248,23 +263,23 @@ class ExchangeRateRevaluation(Document):
new_exchange_rate = get_exchange_rate(d.account_currency, company_currency, posting_date) new_exchange_rate = get_exchange_rate(d.account_currency, company_currency, posting_date)
new_balance_in_base_currency = flt(d.balance_in_account_currency * new_exchange_rate) new_balance_in_base_currency = flt(d.balance_in_account_currency * new_exchange_rate)
gain_loss = flt(new_balance_in_base_currency, precision) - flt(d.balance, precision) gain_loss = flt(new_balance_in_base_currency, precision) - flt(d.balance, precision)
if gain_loss:
accounts.append( accounts.append(
{ {
"account": d.account, "account": d.account,
"party_type": d.party_type, "party_type": d.party_type,
"party": d.party, "party": d.party,
"account_currency": d.account_currency, "account_currency": d.account_currency,
"balance_in_base_currency": d.balance, "balance_in_base_currency": d.balance,
"balance_in_account_currency": d.balance_in_account_currency, "balance_in_account_currency": d.balance_in_account_currency,
"zero_balance": d.zero_balance, "zero_balance": d.zero_balance,
"current_exchange_rate": current_exchange_rate, "current_exchange_rate": current_exchange_rate,
"new_exchange_rate": new_exchange_rate, "new_exchange_rate": new_exchange_rate,
"new_balance_in_base_currency": new_balance_in_base_currency, "new_balance_in_base_currency": new_balance_in_base_currency,
"new_balance_in_account_currency": d.balance_in_account_currency, "new_balance_in_account_currency": d.balance_in_account_currency,
"gain_loss": gain_loss, "gain_loss": gain_loss,
} }
) )
# Handle Accounts with '0' balance in Account/Base Currency # Handle Accounts with '0' balance in Account/Base Currency
for d in [x for x in account_details if x.zero_balance]: for d in [x for x in account_details if x.zero_balance]:
@@ -288,23 +303,22 @@ class ExchangeRateRevaluation(Document):
current_exchange_rate * d.balance_in_account_currency current_exchange_rate * d.balance_in_account_currency
) )
if gain_loss: accounts.append(
accounts.append( {
{ "account": d.account,
"account": d.account, "party_type": d.party_type,
"party_type": d.party_type, "party": d.party,
"party": d.party, "account_currency": d.account_currency,
"account_currency": d.account_currency, "balance_in_base_currency": d.balance,
"balance_in_base_currency": d.balance, "balance_in_account_currency": d.balance_in_account_currency,
"balance_in_account_currency": d.balance_in_account_currency, "zero_balance": d.zero_balance,
"zero_balance": d.zero_balance, "current_exchange_rate": current_exchange_rate,
"current_exchange_rate": current_exchange_rate, "new_exchange_rate": new_exchange_rate,
"new_exchange_rate": new_exchange_rate, "new_balance_in_base_currency": new_balance_in_base_currency,
"new_balance_in_base_currency": new_balance_in_base_currency, "new_balance_in_account_currency": new_balance_in_account_currency,
"new_balance_in_account_currency": new_balance_in_account_currency, "gain_loss": gain_loss,
"gain_loss": gain_loss, }
} )
)
return accounts return accounts