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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-10-29 11:55:50 +05:30
parent 935f2e11e8
commit a937e32989
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

@@ -610,19 +610,7 @@ def make_payment_request(**args):
"party_type": party_type, "party_type": party_type,
"party": args.get("party") or ref_doc.get("customer"), "party": args.get("party") or ref_doc.get("customer"),
"bank_account": bank_account, "bank_account": bank_account,
<<<<<<< HEAD
=======
"party_name": args.get("party_name") or ref_doc.get("customer_name"), "party_name": args.get("party_name") or ref_doc.get("customer_name"),
"make_sales_invoice": (
args.make_sales_invoice # new standard
or args.order_type == "Shopping Cart" # compat for webshop app
),
"mute_email": (
args.mute_email # new standard
or args.order_type == "Shopping Cart" # compat for webshop app
or gateway_account.get("payment_channel", "Email") != "Email"
),
>>>>>>> 0acb609d97 (feat: add party name in payment request)
} }
) )