From 0142a9308bc515f64bd856a005358f03d6d91478 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Sun, 12 Nov 2023 19:43:01 +0100 Subject: [PATCH] chore: resolve conflicts --- erpnext/selling/doctype/customer/customer.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py index 587a1a1e1f2..5d41cf1041d 100644 --- a/erpnext/selling/doctype/customer/customer.py +++ b/erpnext/selling/doctype/customer/customer.py @@ -310,15 +310,10 @@ def create_contact(contact, party_type, party, email): contact = frappe.get_doc( { "doctype": "Contact", -<<<<<<< HEAD - "first_name": contact[0], - "last_name": len(contact) > 1 and contact[1] or "", -======= "first_name": names[0], "middle_name": len(names) > 2 and " ".join(names[1:-1]) or "", "last_name": len(names) > 1 and names[-1] or "", "is_primary_contact": 1, ->>>>>>> 9fde782403 (fix(customer): contact creation for companies (#38055)) } ) contact.append("email_ids", dict(email_id=email, is_primary=1))