CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-03 12:18:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: issue occured when creating supplier with contact details (backport #38147) (#39046)

Browse Source 
* fix: issue occured when creating supplier with contact details

(cherry picked from commit 7842c9fba8)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.py

* fix: Suppier name was not taken when creating address from supplier

(cherry picked from commit 545ef3c234)

* chore: fix conflicts

* chore: fix linter issues

---------

Co-authored-by: kunhi <kunhimohamed6@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2023-12-31 18:06:47 +05:30
committed by GitHub
parent 88e5c9e61b
commit 81ef7b4c00
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -690,8 +690,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,
@@ -703,9 +707,10 @@ def make_contact(args, is_primary_contact=1):
values.update( values.update(
{ {
"first_name": args.get("customer_name"), "first_name": args.get("customer_name"),
"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"):
@@ -734,10 +739,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"),