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

Merge pull request #38174 from frappe/mergify/bp/version-15-hotfix/pr-38147

Browse Source 
fix: issue occured when creating supplier with contact details (#38147)
This commit is contained in:
Deepesh Garg 2023-11-19 19:21:36 +05:30 committed by GitHub
commit fc1ee1b3ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -644,8 +644,12 @@ def make_contact(args, is_primary_contact=1):
"is_primary_contact": is_primary_contact, "is_primary_contact": is_primary_contact,
"links": [{"link_doctype": args.get("doctype"), "link_name": args.get("name")}], "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")) 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))
values.update( values.update(
{ {
"first_name": first, "first_name": first,
@ -656,9 +660,10 @@ def make_contact(args, is_primary_contact=1):
else: else:
values.update( values.update(
{ {
"company_name": args.get("customer_name"), "company_name": args.get(party_name_key),
} }
) )
contact = frappe.get_doc(values) contact = frappe.get_doc(values)
if args.get("email_id"): if args.get("email_id"):
@ -687,10 +692,12 @@ def make_address(args, is_primary_address=1, is_shipping_address=1):
title=_("Missing Values Required"), title=_("Missing Values Required"),
) )
party_name_key = "customer_name" if args.doctype == "Customer" else "supplier_name"
address = frappe.get_doc( address = frappe.get_doc(
{ {
"doctype": "Address", "doctype": "Address",
"address_title": args.get("customer_name"), "address_title": args.get(party_name_key),
"address_line1": args.get("address_line1"), "address_line1": args.get("address_line1"),
"address_line2": args.get("address_line2"), "address_line2": args.get("address_line2"),
"city": args.get("city"), "city": args.get("city"),