Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
barredterra 2023-11-12 19:43:01 +01:00
parent fc09d757f0
commit 0142a9308b
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/selling/doctype/customer/customer.py
View File

@ -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))