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

chore: resolve conflict

Browse Source
This commit is contained in:
Navin-S-R
2026-03-19 13:06:16 +05:30
parent 4f39dfd642
commit e2c8dc5386
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/portal/utils.py
View File

@@ -48,23 +48,7 @@ def create_customer_or_supplier():
return return
fullname = frappe.utils.get_fullname(user) 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) party = create_party(doctype, fullname)
>>>>>>> 256d267a3b (fix: set customer details on customer creation at login (#53509))
alternate_doctype = "Customer" if doctype == "Supplier" else "Supplier" alternate_doctype = "Customer" if doctype == "Supplier" else "Supplier"
if party_exists(alternate_doctype, user): if party_exists(alternate_doctype, user):