From e2c8dc538659c2bb9b1ee66f7cd67047ab7f9a11 Mon Sep 17 00:00:00 2001 From: Navin-S-R Date: Thu, 19 Mar 2026 13:06:16 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/portal/utils.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/erpnext/portal/utils.py b/erpnext/portal/utils.py index 14c6abe2f4b..cfdf8e18191 100644 --- a/erpnext/portal/utils.py +++ b/erpnext/portal/utils.py @@ -48,23 +48,7 @@ def create_customer_or_supplier(): return fullname = frappe.utils.get_fullname(user) -<<<<<<< HEAD - - if not doctype == "Customer": - party.update( - { - "supplier_name": fullname, - "supplier_group": "All Supplier Groups", - "supplier_type": "Individual", - } - ) - - party.flags.ignore_mandatory = True - party.insert(ignore_permissions=True) - -======= party = create_party(doctype, fullname) ->>>>>>> 256d267a3b (fix: set customer details on customer creation at login (#53509)) alternate_doctype = "Customer" if doctype == "Supplier" else "Supplier" if party_exists(alternate_doctype, user):