CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 18:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: payment entry is already created on posawesome. (backport #34712) (#34752)

Browse Source
This commit is contained in:
mergify[bot]
2023-04-05 13:55:13 +05:30
committed by GitHub
parent 3ad5d676ab
commit 8ba1e0f31e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/doctype/payment_request/payment_request.py
View File

@@ -497,10 +497,16 @@ def get_amount(ref_doc, payment_account=None):
if dt in ["Sales Order", "Purchase Order"]: if dt in ["Sales Order", "Purchase Order"]:
grand_total = flt(ref_doc.rounded_total) or flt(ref_doc.grand_total) grand_total = flt(ref_doc.rounded_total) or flt(ref_doc.grand_total)
elif dt in ["Sales Invoice", "Purchase Invoice"]: elif dt in ["Sales Invoice", "Purchase Invoice"]:
if ref_doc.party_account_currency == ref_doc.currency: if not ref_doc.is_pos:
grand_total = flt(ref_doc.outstanding_amount) if ref_doc.party_account_currency == ref_doc.currency:
else: grand_total = flt(ref_doc.outstanding_amount)
grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate 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
elif dt == "POS Invoice": elif dt == "POS Invoice":
for pay in ref_doc.payments: for pay in ref_doc.payments:
if pay.type == "Phone" and pay.account == payment_account: if pay.type == "Phone" and pay.account == payment_account: