diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 09f7d5c7d51..ad692f1557d 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -3316,13 +3316,11 @@ def set_paid_amount_and_received_amount( company_currency = frappe.get_cached_value("Company", doc.get("company"), "default_currency") if bank and company_currency != bank.account_currency: # 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 - ) + conversion_rate = get_exchange_rate(bank.account_currency, party_account_currency) received_amount = paid_amount / conversion_rate else: - received_amount = paid_amount * doc.get("conversion_rate", 1) + conversion_rate = get_exchange_rate(doc.get("currency", company_currency), company_currency) + received_amount = paid_amount * conversion_rate # if payment type is pay, then paid amount and received amount are swapped if payment_type == "Pay":