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

chore: resolve conflicts

Browse Source
This commit is contained in:
barredterra
2025-06-25 17:24:27 +02:00
parent 2912e22c37
commit d8c1bc26c4
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,14 +390,9 @@ def create_contact(contact, party_type, party, email):
doc = frappe.get_doc( doc = frappe.get_doc(
{ {
"doctype": "Contact", "doctype": "Contact",
<<<<<<< HEAD
"first_name": first, "first_name": first,
"middle_name": middle, "middle_name": middle,
"last_name": last, "last_name": last,
=======
"first_name": contact[0],
"last_name": len(contact) > 1 and contact[1] or "",
>>>>>>> a74e1f1600 (fix(crm): ensure primary address and contact follows customer setting (#37710))
"is_primary_contact": 1, "is_primary_contact": 1,
} }
) )