Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext into draft-mode-print

Browse Source
This commit is contained in:
Saurabh 2018-01-23 17:33:21 +05:30
commit 6c5f5b20cf
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({
this.frm.add_custom_button(__("Customer"), this.create_customer, __("Make"));
this.frm.add_custom_button(__("Opportunity"), this.create_opportunity, __("Make"));
this.frm.add_custom_button(__("Quotation"), this.make_quotation, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
if(!this.frm.doc.__islocal) {

2
erpnext/crm/doctype/opportunity/opportunity.js
View File

@ -48,8 +48,6 @@ frappe.ui.form.on("Opportunity", {
frm.add_custom_button(__('Quotation'),
cur_frm.cscript.create_quotation, __("Make"));
frm.page.set_inner_btn_group_as_primary(__("Make"));
if(doc.status!=="Quotation") {
frm.add_custom_button(__('Lost'),
cur_frm.cscript['Declare Opportunity Lost']);

3
erpnext/hr/doctype/job_applicant/job_applicant.js
View File

@ -21,8 +21,7 @@ frappe.ui.form.on("Job Applicant", {
"designation": frm.doc.job_opening,
};
frappe.new_doc("Offer Letter");
}, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
});
}
}

7
erpnext/public/js/communication.js
View File

@ -19,17 +19,16 @@ frappe.ui.form.on("Communication", {
if(!in_list(["Lead", "Opportunity"], frm.doc.reference_doctype)) {
frm.add_custom_button(__("Lead"), () => {
frappe.confirm(__(confirm_msg, [__("Lead")]), () => {
frm.trigger('make_lead_from_communication');
frm.trigger('make_lead_from_communication');
})
}, "Make");
}, __("Make"));
frm.add_custom_button(__("Opportunity"), () => {
frappe.confirm(__(confirm_msg, [__("Opportunity")]), () => {
frm.trigger('make_opportunity_from_communication');
})
}, "Make");
}, __("Make"));
}
frm.page.set_inner_btn_group_as_primary(__("Make"));
},
make_lead_from_communication: (frm) => {

3
erpnext/support/doctype/warranty_claim/warranty_claim.js
View File

@ -26,8 +26,7 @@ erpnext.support.WarrantyClaim = frappe.ui.form.Controller.extend({
if(!cur_frm.doc.__islocal &&
(cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
cur_frm.add_custom_button(__('Maintenance Visit'),
this.make_maintenance_visit, __("Make"))
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
this.make_maintenance_visit);
}
},