nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 20:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-08-27 17:11:10 +05:30
parent f960aac639
commit 6310497403
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -566,14 +566,10 @@ def get_amount(ref_doc, payment_account=None):
elif dt == "Fees": elif dt == "Fees":
grand_total = ref_doc.outstanding_amount grand_total = ref_doc.outstanding_amount
<<<<<<< HEAD
return grand_total
=======
if grand_total > 0: if grand_total > 0:
return flt(grand_total, get_currency_precision()) return flt(grand_total, get_currency_precision())
else: else:
frappe.throw(_("Payment Entry is already created")) frappe.throw(_("Payment Entry is already created"))
>>>>>>> 976abf7b3c (fix: Update get_amount to return currency precision grand total)
def get_existing_payment_request_amount(ref_dt, ref_dn): def get_existing_payment_request_amount(ref_dt, ref_dn):