From e271933e43a9d2b7112004c1f204c48d0280e3b4 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 8 Apr 2025 13:22:33 +0530 Subject: [PATCH] chore: resolve conflict --- .../doctype/payment_request/payment_request.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 3f20f0f6849..0027f0aa8be 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -555,18 +555,6 @@ def make_payment_request(**args): frappe.db.set_value("Sales Order", args.dn, "loyalty_amount", loyalty_amount, update_modified=False) grand_total = grand_total - loyalty_amount -<<<<<<< HEAD - bank_account = ( - get_party_bank_account(args.get("party_type"), args.get("party")) if args.get("party_type") else "" - ) - - draft_payment_request = frappe.db.get_value( - "Payment Request", - {"reference_doctype": args.dt, "reference_name": args.dn, "docstatus": 0}, - ) - -======= ->>>>>>> 913c60d77b (fix: correct payment request amount) # fetches existing payment request `grand_total` amount existing_payment_request_amount = get_existing_payment_request_amount(ref_doc)