fix: Make Customer and lead field dynamic in quotations and opportunity (frappe#17097)

fix: Make Customer and lead field dynamic in quotations and opportunity

Author: netchampfaris

erpnext/crm/doctype/lead/lead.py

@@ -90,11 +90,11 @@ def has_customer(self):
 		return frappe.db.get_value("Customer", {"lead_name": self.name})
 
 	def has_opportunity(self):
-		return frappe.db.get_value("Opportunity", {"lead": self.name, "status": ["!=", "Lost"]})
+		return frappe.db.get_value("Opportunity", {"party_name": self.name, "status": ["!=", "Lost"]})
 
 	def has_quotation(self):
 		return frappe.db.get_value("Quotation", {
-			"lead": self.name,
+			"party_name": self.name,
 			"docstatus": 1,
 			"status": ["!=", "Lost"]
 

erpnext/crm/doctype/opportunity/opportunity.js

@@ -9,15 +9,22 @@ frappe.ui.form.on("Opportunity", {
 		frm.custom_make_buttons = {
 			'Quotation': 'Quotation',
 			'Supplier Quotation': 'Supplier Quotation'
-		}
-	},
-	customer: function(frm) {
-		frm.trigger('set_contact_link');
-		erpnext.utils.get_party_details(frm);
+		},
+
+		frm.set_query("opportunity_from", function() {
+			return{
+				"filters": {
+					"name": ["in", ["Customer", "Lead"]],
+				}
+			}
+		});
 	},
 
-	lead: function(frm) {
-		frm.trigger('set_contact_link');
+	party_name: function(frm) {
+		if (frm.doc.opportunity_from == "Customer") {
+			frm.trigger('set_contact_link');
+			erpnext.utils.get_party_details(frm);
+		}
 	},
 
 	with_items: function(frm) {
@@ -30,15 +37,14 @@ frappe.ui.form.on("Opportunity", {
 
 	contact_person: erpnext.utils.get_contact_details,
 
-	enquiry_from: function(frm) {
-		frm.toggle_reqd("lead", frm.doc.enquiry_from==="Lead");
-		frm.toggle_reqd("customer", frm.doc.enquiry_from==="Customer");
+	opportunity_from: function(frm) {
+		frm.toggle_reqd("party_name", frm.doc.opportunity_from);
+		frm.trigger("set_dynamic_field_label");
 	},
 
 	refresh: function(frm) {
 		var doc = frm.doc;
-		frm.events.enquiry_from(frm);
-		frm.trigger('set_contact_link');
+		frm.events.opportunity_from(frm);
 		frm.trigger('toggle_mandatory');
 		erpnext.toggle_naming_series();
 
@@ -75,13 +81,20 @@ frappe.ui.form.on("Opportunity", {
 	},
 
 	set_contact_link: function(frm) {
-		if(frm.doc.customer) {
+		if(frm.doc.opportunity_from == "Customer" && frm.doc.party_name) {
 			frappe.dynamic_link = {doc: frm.doc, fieldname: 'customer', doctype: 'Customer'}
-		} else if(frm.doc.lead) {
+		} else if(frm.doc.opportunity_from == "Lead" && frm.doc.party_name) {
 			frappe.dynamic_link = {doc: frm.doc, fieldname: 'lead', doctype: 'Lead'}
 		}
 	},
 
+	set_dynamic_field_label: function(frm){
+
+		if (frm.doc.opportunity_from) {
+			frm.set_df_property("party_name", "label", frm.doc.opportunity_from);
+		}
+	},
+
 	make_supplier_quotation: function(frm) {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.crm.doctype.opportunity.opportunity.make_supplier_quotation",
@@ -97,10 +110,6 @@ frappe.ui.form.on("Opportunity", {
 // TODO commonify this code
 erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
 	onload: function() {
-		if(!this.frm.doc.enquiry_from && this.frm.doc.customer)
-			this.frm.doc.enquiry_from = "Customer";
-		if(!this.frm.doc.enquiry_from && this.frm.doc.lead)
-			this.frm.doc.enquiry_from = "Lead";
 
 		if(!this.frm.doc.status)
 			set_multiple(this.frm.doc.doctype, this.frm.doc.name, { status:'Open' });
@@ -148,7 +157,7 @@ erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
 $.extend(cur_frm.cscript, new erpnext.crm.Opportunity({frm: cur_frm}));
 
 cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
-	if(doc.enquiry_from == 'Lead' && doc.lead)
+	if(doc.opportunity_from == 'Lead' && doc.party_name)
 		cur_frm.cscript.lead(doc, cdt, cdn);
 }
 
@@ -171,10 +180,10 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
 }
 
 cur_frm.cscript.lead = function(doc, cdt, cdn) {
-	cur_frm.toggle_display("contact_info", doc.customer || doc.lead);
+	cur_frm.toggle_display("contact_info", doc.party_name);
 	erpnext.utils.map_current_doc({
 		method: "erpnext.crm.doctype.lead.lead.make_opportunity",
-		source_name: cur_frm.doc.lead,
+		source_name: cur_frm.doc.party_name,
 		frm: cur_frm
 	});
 }