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

fix: creation of contact, customer, opportunity, quotation and prospect from lead --prettier

Browse Source 
(cherry picked from commit 5844897c34)

# Conflicts:
#	erpnext/crm/doctype/lead/lead.js
This commit is contained in:
Nihantra Patel
2024-06-24 16:03:39 +05:30
committed by Mergify
parent ef10c4ea4f
commit 5a2a404a50
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/crm/doctype/lead/lead.js
View File

@@ -28,6 +28,7 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
erpnext.toggle_naming_series(); erpnext.toggle_naming_series();
if (!this.frm.is_new() && doc.__onload && !doc.__onload.is_customer) { if (!this.frm.is_new() && doc.__onload && !doc.__onload.is_customer) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
this.frm.add_custom_button(__("Customer"), this.make_customer, __("Create")); this.frm.add_custom_button(__("Customer"), this.make_customer, __("Create"));
this.frm.add_custom_button( this.frm.add_custom_button(
@@ -55,12 +56,13 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
__("Create") __("Create")
); );
>>>>>>> 8304d19e8b (fix: creation of contact, customer, opportunity, quotation and prospect from lead) >>>>>>> 8304d19e8b (fix: creation of contact, customer, opportunity, quotation and prospect from lead)
=======
this.frm.add_custom_button(__("Customer"), this.make_customer.bind(this), __("Create"));
this.frm.add_custom_button(__("Opportunity"), this.make_opportunity.bind(this), __("Create"));
this.frm.add_custom_button(__("Quotation"), this.make_quotation.bind(this), __("Create"));
>>>>>>> 5844897c34 (fix: creation of contact, customer, opportunity, quotation and prospect from lead --prettier)
if (!doc.__onload.linked_prospects.length) { if (!doc.__onload.linked_prospects.length) {
this.frm.add_custom_button( this.frm.add_custom_button(__("Prospect"), this.make_prospect.bind(this), __("Create"));
__("Prospect"),
this.make_prospect.bind(this),
__("Create")
);
this.frm.add_custom_button(__("Add to Prospect"), this.add_lead_to_prospect, __("Action")); this.frm.add_custom_button(__("Add to Prospect"), this.add_lead_to_prospect, __("Action"));
} }
} }