From 899d25b110e4b869674a40dd0aba378c68597111 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Sat, 18 Nov 2023 18:45:14 +0100
Subject: [PATCH] style: remove trailing whitespace (#38183)

(cherry picked from commit ff5b1b7dedccc23ed7ba71776e5d3d9c385fd222)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.py
---
 erpnext/selling/doctype/customer/customer.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 27bb8845dd6d..280321fd19b7 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -644,8 +644,17 @@ def make_contact(args, is_primary_contact=1):
 		"is_primary_contact": is_primary_contact,
 		"links": [{"link_doctype": args.get("doctype"), "link_name": args.get("name")}],
 	}
+<<<<<<< HEAD
 	if args.customer_type == "Individual":
 		first, middle, last = parse_full_name(args.get("customer_name"))
+=======
+
+	party_type = args.customer_type if args.doctype == "Customer" else args.supplier_type
+	party_name_key = "customer_name" if args.doctype == "Customer" else "supplier_name"
+
+	if party_type == "Individual":
+		first, middle, last = parse_full_name(args.get(party_name_key))
+>>>>>>> ff5b1b7ded (style: remove trailing whitespace (#38183))
 		values.update(
 			{
 				"first_name": first,
@@ -659,6 +668,10 @@ def make_contact(args, is_primary_contact=1):
 				"company_name": args.get("customer_name"),
 			}
 		)
+<<<<<<< HEAD
+=======
+
+>>>>>>> ff5b1b7ded (style: remove trailing whitespace (#38183))
 	contact = frappe.get_doc(values)
 
 	if args.get("email_id"):