nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-04-08 13:22:33 +05:30
parent 23c76aa530
commit e271933e43
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -555,18 +555,6 @@ def make_payment_request(**args):
frappe.db.set_value("Sales Order", args.dn, "loyalty_amount", loyalty_amount, update_modified=False) frappe.db.set_value("Sales Order", args.dn, "loyalty_amount", loyalty_amount, update_modified=False)
grand_total = grand_total - loyalty_amount 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 # fetches existing payment request `grand_total` amount
existing_payment_request_amount = get_existing_payment_request_amount(ref_doc) existing_payment_request_amount = get_existing_payment_request_amount(ref_doc)