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

fix: set correct paid/receive amount if doc currency is different from party account currency

Browse Source 
(cherry picked from commit 9612521894)
This commit is contained in:
ljain112
2025-04-21 12:11:13 +05:30
committed by Mergify
parent 8bc00ffbb4
commit 5dc63f97a1
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3300,26 +3300,25 @@ def set_paid_amount_and_received_amount(
if party_account_currency == bank.account_currency: if party_account_currency == bank.account_currency:
paid_amount = received_amount = abs(outstanding_amount) paid_amount = received_amount = abs(outstanding_amount)
else: else:
company_currency = frappe.get_cached_value("Company", doc.get("company"), "default_currency") # settings if it is for receive
if payment_type == "Receive": paid_amount = abs(outstanding_amount)
paid_amount = abs(outstanding_amount) if bank_amount:
if bank_amount: received_amount = bank_amount
received_amount = bank_amount
else:
if bank and company_currency != bank.account_currency:
received_amount = paid_amount / doc.get("conversion_rate", 1)
else:
received_amount = paid_amount * doc.get("conversion_rate", 1)
else: else:
received_amount = abs(outstanding_amount) company_currency = frappe.get_cached_value("Company", doc.get("company"), "default_currency")
if bank_amount: if bank and company_currency != bank.account_currency:
paid_amount = bank_amount # doc currency can be different from bank currency
posting_date = doc.get("posting_date") or doc.get("transaction_date")
conversion_rate = get_exchange_rate(
bank.account_currency, party_account_currency, posting_date
)
received_amount = paid_amount / conversion_rate
else: else:
if bank and company_currency != bank.account_currency: received_amount = paid_amount * doc.get("conversion_rate", 1)
paid_amount = received_amount / doc.get("conversion_rate", 1)
else: # if payment type is pay, then paid amount and received amount are swapped
# if party account currency and bank currency is different then populate paid amount as well if payment_type == "Pay":
paid_amount = received_amount * doc.get("conversion_rate", 1) paid_amount, received_amount = received_amount, paid_amount
return paid_amount, received_amount return paid_amount, received_amount