From 6310497403dcbbbfc4d25e84c090779db899fe9b Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 27 Aug 2024 17:11:10 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/accounts/doctype/payment_request/payment_request.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 8da6f153113..862f2dc0452 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -566,14 +566,10 @@ def get_amount(ref_doc, payment_account=None): elif dt == "Fees": grand_total = ref_doc.outstanding_amount -<<<<<<< HEAD - return grand_total -======= if grand_total > 0: return flt(grand_total, get_currency_precision()) else: 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):