From 60b61da29068e15f2121383d2a375bc3c5a35cc1 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 5 Apr 2023 17:10:52 +0530 Subject: [PATCH] Revert "fix: `payment entry is already created` on posawesome. (backport #34712) (#34753)" This reverts commit b48fca3e5ae12a31aa5c06bc3b1bdcb714100a80. --- .../doctype/payment_request/payment_request.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 462a0b4df86..f05dd5ba496 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -472,24 +472,11 @@ def get_amount(ref_doc, payment_account=None): grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) / ref_doc.conversion_rate elif dt in ["Sales Invoice", "Purchase Invoice"]: -<<<<<<< HEAD if ref_doc.party_account_currency == ref_doc.currency: grand_total = flt(ref_doc.outstanding_amount) else: grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate -======= - if not ref_doc.is_pos: - if ref_doc.party_account_currency == ref_doc.currency: - grand_total = flt(ref_doc.outstanding_amount) - else: - grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate - elif dt == "Sales Invoice": - for pay in ref_doc.payments: - if pay.type == "Phone" and pay.account == payment_account: - grand_total = pay.amount - break ->>>>>>> 9bf87d708e (fix: `payment entry is already created` on posawesome. (#34712)) elif dt == "POS Invoice": for pay in ref_doc.payments: if pay.type == "Phone" and pay.account == payment_account: