From f03e58f5f621835aa6150568994cc30ef22f5c16 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 30 Jul 2024 13:39:14 +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 1add678dd1d..48bb6f2ae86 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -497,15 +497,11 @@ def make_payment_request(**args): for dimension in get_accounting_dimensions(): pr.update({dimension: ref_doc.get(dimension)}) -<<<<<<< HEAD if args.order_type == "Shopping Cart" or args.mute_email: pr.flags.mute_email = True - pr.insert(ignore_permissions=True) -======= if frappe.db.get_single_value("Accounts Settings", "create_pr_in_draft_status", cache=True): pr.insert(ignore_permissions=True) ->>>>>>> ce81fd9ba6 (refactor: checkbox to control Payment Request creation) if args.submit_doc: pr.submit()