Skip to content

Commit

Permalink
Merge pull request #38753 from barredterra/contact-from-customer-crea…
Browse files Browse the repository at this point in the history
…tion

fix: address and contact from customer creation (backport #38055, #37386, #38060)
  • Loading branch information
deepeshgarg007 authored Dec 15, 2023
2 parents 73d525e + 6ed7c66 commit e539152
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 21 deletions.
76 changes: 56 additions & 20 deletions erpnext/selling/doctype/customer/customer.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,18 +307,19 @@ def set_loyalty_program(self):

def create_contact(contact, party_type, party, email):
"""Create contact based on given contact name"""
contact = contact.split(" ")

contact = frappe.get_doc(
first, middle, last = parse_full_name(contact)
doc = frappe.get_doc(
{
"doctype": "Contact",
"first_name": contact[0],
"last_name": len(contact) > 1 and contact[1] or "",
"first_name": first,
"middle_name": middle,
"last_name": last,
"is_primary_contact": 1,
}
)
contact.append("email_ids", dict(email_id=email, is_primary=1))
contact.append("links", dict(link_doctype=party_type, link_name=party))
contact.insert()
doc.append("email_ids", dict(email_id=email, is_primary=1))
doc.append("links", dict(link_doctype=party_type, link_name=party))
return doc.insert()


@frappe.whitelist()
Expand Down Expand Up @@ -684,24 +685,42 @@ def get_credit_limit(customer, company):


def make_contact(args, is_primary_contact=1):
contact = frappe.get_doc(
{
"doctype": "Contact",
"first_name": args.get("name"),
"is_primary_contact": is_primary_contact,
"links": [{"link_doctype": args.get("doctype"), "link_name": args.get("name")}],
}
)
values = {
"doctype": "Contact",
"is_primary_contact": is_primary_contact,
"links": [{"link_doctype": args.get("doctype"), "link_name": args.get("name")}],
}
if args.customer_type == "Individual":
first, middle, last = parse_full_name(args.get("customer_name"))
values.update(
{
"first_name": first,
"middle_name": middle,
"last_name": last,
}
)
else:
values.update(
{
"company_name": args.get("customer_name"),
}
)
contact = frappe.get_doc(values)

if args.get("email_id"):
contact.add_email(args.get("email_id"), is_primary=True)
if args.get("mobile_no"):
contact.add_phone(args.get("mobile_no"), is_primary_mobile_no=True)
contact.insert()

if flags := args.get("flags"):
contact.insert(ignore_permissions=flags.get("ignore_permissions"))
else:
contact.insert()

return contact


def make_address(args, is_primary_address=1):
def make_address(args, is_primary_address=1, is_shipping_address=1):
reqd_fields = []
for field in ["city", "country"]:
if not args.get(field):
Expand All @@ -717,16 +736,23 @@ def make_address(args, is_primary_address=1):
address = frappe.get_doc(
{
"doctype": "Address",
"address_title": args.get("name"),
"address_title": args.get("customer_name"),
"address_line1": args.get("address_line1"),
"address_line2": args.get("address_line2"),
"city": args.get("city"),
"state": args.get("state"),
"pincode": args.get("pincode"),
"country": args.get("country"),
"is_primary_address": is_primary_address,
"is_shipping_address": is_shipping_address,
"links": [{"link_doctype": args.get("doctype"), "link_name": args.get("name")}],
}
).insert()
)

if flags := args.get("flags"):
address.insert(ignore_permissions=flags.get("ignore_permissions"))
else:
address.insert()

return address

Expand All @@ -747,3 +773,13 @@ def get_customer_primary_contact(doctype, txt, searchfield, start, page_len, fil
.where((dlink.link_name == customer) & (con.name.like(f"%{txt}%")))
.run()
)


def parse_full_name(full_name: str) -> tuple[str, str | None, str | None]:
"""Parse full name into first name, middle name and last name"""
names = full_name.split()
first_name = names[0]
middle_name = " ".join(names[1:-1]) if len(names) > 2 else None
last_name = names[-1] if len(names) > 1 else None

return first_name, middle_name, last_name
22 changes: 21 additions & 1 deletion erpnext/selling/doctype/customer/test_customer.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

from erpnext.accounts.party import get_due_date
from erpnext.exceptions import PartyDisabled, PartyFrozen
from erpnext.selling.doctype.customer.customer import get_credit_limit, get_customer_outstanding
from erpnext.selling.doctype.customer.customer import (
get_credit_limit,
get_customer_outstanding,
parse_full_name,
)
from erpnext.tests.utils import create_test_contact_and_address

test_ignore = ["Price List"]
Expand Down Expand Up @@ -373,6 +377,22 @@ def test_serach_fields_for_customer(self):

frappe.db.set_value("Selling Settings", None, "cust_master_name", "Customer Name")

def test_parse_full_name(self):
first, middle, last = parse_full_name("John")
self.assertEqual(first, "John")
self.assertEqual(middle, None)
self.assertEqual(last, None)

first, middle, last = parse_full_name("John Doe")
self.assertEqual(first, "John")
self.assertEqual(middle, None)
self.assertEqual(last, "Doe")

first, middle, last = parse_full_name("John Michael Doe")
self.assertEqual(first, "John")
self.assertEqual(middle, "Michael")
self.assertEqual(last, "Doe")


def get_customer_dict(customer_name):
return {
Expand Down

0 comments on commit e539152

Please sign in to comment.