mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-01 11:19:09 +00:00
fix: creation of contact, customer, opportunity, quotation and prospect from lead --prettier
(cherry picked from commit 5844897c34)
# Conflicts:
# erpnext/crm/doctype/lead/lead.js
This commit is contained in:
@@ -28,6 +28,7 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
|
||||
erpnext.toggle_naming_series();
|
||||
|
||||
if (!this.frm.is_new() && doc.__onload && !doc.__onload.is_customer) {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
this.frm.add_custom_button(__("Customer"), this.make_customer, __("Create"));
|
||||
this.frm.add_custom_button(
|
||||
@@ -55,12 +56,13 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller
|
||||
__("Create")
|
||||
);
|
||||
>>>>>>> 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) {
|
||||
this.frm.add_custom_button(
|
||||
__("Prospect"),
|
||||
this.make_prospect.bind(this),
|
||||
__("Create")
|
||||
);
|
||||
this.frm.add_custom_button(__("Prospect"), this.make_prospect.bind(this), __("Create"));
|
||||
this.frm.add_custom_button(__("Add to Prospect"), this.add_lead_to_prospect, __("Action"));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user