Skip to content

Commit

Permalink
Revert "fix: payment entry is already created on posawesome. (frapp…
Browse files Browse the repository at this point in the history
…e#34712)"

Revert "fix: `payment entry is already created` on posawesome. (backport frappe#34712) (frappe#34753)"

This reverts commit b48fca3.
  • Loading branch information
deepeshgarg007 committed Apr 5, 2023
1 parent b48fca3 commit 034e35e
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions erpnext/accounts/doctype/payment_request/payment_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 034e35e

Please sign in to comment.