From ead8d82a84e297a46362c9d9d08ffc5cda9a0863 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Mon, 6 May 2019 17:16:57 +0530
Subject: [PATCH] fix: not able to make sales order from the lead quotation

---
 .../selling/doctype/quotation/quotation.py    | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 821a7d39ec8..407e8a2c288 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -212,35 +212,38 @@ def _make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
 	return doclist
 
 def _make_customer(source_name, ignore_permissions=False):
-	quotation = frappe.db.get_value("Quotation", source_name, ["order_type", "party_name", "customer_name"])
-	if quotation and quotation[1] and not quotation[2]:
-		lead_name = quotation[1]
-		customer_name = frappe.db.get_value("Customer", {"lead_name": lead_name},
-			["name", "customer_name"], as_dict=True)
-		if not customer_name:
-			from erpnext.crm.doctype.lead.lead import _make_customer
-			customer_doclist = _make_customer(lead_name, ignore_permissions=ignore_permissions)
-			customer = frappe.get_doc(customer_doclist)
-			customer.flags.ignore_permissions = ignore_permissions
-			if quotation[1] == "Shopping Cart":
-				customer.customer_group = frappe.db.get_value("Shopping Cart Settings", None,
-					"default_customer_group")
+	quotation = frappe.db.get_value("Quotation",
+		source_name, ["order_type", "party_name", "customer_name"], as_dict=1)
 
-			try:
-				customer.insert()
-				return customer
-			except frappe.NameError:
-				if frappe.defaults.get_global_default('cust_master_name') == "Customer Name":
-					customer.run_method("autoname")
-					customer.name += "-" + lead_name
+	if quotation and quotation.get('party_name'):
+		if not frappe.db.exists("Customer", quotation.get("party_name")):
+			lead_name = quotation.get("party_name")
+			customer_name = frappe.db.get_value("Customer", {"lead_name": lead_name},
+				["name", "customer_name"], as_dict=True)
+			if not customer_name:
+				from erpnext.crm.doctype.lead.lead import _make_customer
+				customer_doclist = _make_customer(lead_name, ignore_permissions=ignore_permissions)
+				customer = frappe.get_doc(customer_doclist)
+				customer.flags.ignore_permissions = ignore_permissions
+				if quotation.get("party_name") == "Shopping Cart":
+					customer.customer_group = frappe.db.get_value("Shopping Cart Settings", None,
+						"default_customer_group")
+
+				try:
 					customer.insert()
 					return customer
-				else:
-					raise
-			except frappe.MandatoryError:
-				frappe.local.message_log = []
-				frappe.throw(_("Please create Customer from Lead {0}").format(lead_name))
+				except frappe.NameError:
+					if frappe.defaults.get_global_default('cust_master_name') == "Customer Name":
+						customer.run_method("autoname")
+						customer.name += "-" + lead_name
+						customer.insert()
+						return customer
+					else:
+						raise
+				except frappe.MandatoryError:
+					frappe.local.message_log = []
+					frappe.throw(_("Please create Customer from Lead {0}").format(lead_name))
+			else:
+				return customer_name
 		else:
-			return customer_name
-	elif quotation and quotation[1]:
-		return frappe.get_doc("Customer",quotation[1])
+			return frappe.get_doc("Customer", quotation.get("party_name"))
\ No newline at end of file