From 5aef9d2ef2fb4190b4a9f98d538843b0a74e2ae7 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 15 Apr 2024 20:49:40 +0530 Subject: [PATCH] fix: Test case (cherry picked from commit 071e5ed648b3627ac5594aecb7601f6909540e1f) --- .../doctype/payment_request/payment_request.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 27b8e25a57b..583735b1cc6 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -37,7 +37,7 @@ class PaymentRequest(Document): self.status = "Draft" self.validate_reference_document() self.validate_payment_request_amount() - self.validate_currency() + # self.validate_currency() self.validate_subscription_details() def validate_reference_document(self): @@ -276,8 +276,13 @@ class PaymentRequest(Document): } ) - payment_entry.received_amount = payment_entry.base_paid_amount - payment_entry.get("references")[0].allocated_amount = payment_entry.base_paid_amount + if party_account_currency == ref_doc.company_currency and party_account_currency != self.currency: + amount = payment_entry.base_paid_amount + else: + amount = self.grand_total + + payment_entry.received_amount = amount + payment_entry.get("references")[0].allocated_amount = amount for dimension in get_accounting_dimensions(): payment_entry.update({dimension: self.get(dimension)})