nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 19:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[enhance] merge customize buttons under groups

Browse Source
This commit is contained in:
Saurabh
2016-01-06 15:34:56 +05:30
parent 025a407e13
commit e23e99f4bd
33 changed files with 195 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/hr/doctype/employee/employee.js
View File

@@ -24,8 +24,9 @@ erpnext.hr.EmployeeController = frappe.ui.form.Controller.extend({
erpnext.toggle_naming_series();
if(!this.frm.doc.__islocal && this.frm.doc.__onload &&
!this.frm.doc.__onload.salary_structure_exists) {
cur_frm.add_custom_button(__('Make Salary Structure'), function() {
me.make_salary_structure(this); }, frappe.boot.doctype_icons["Salary Structure"]);
cur_frm.add_custom_button(__('Salary Structure'), function() {
me.make_salary_structure(this); }, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
},

5
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@@ -97,8 +97,9 @@ cur_frm.cscript.refresh = function(doc,cdt,cdn){
if(doc.docstatus==1 && frappe.model.can_create("Journal Entry") &&
cint(doc.total_amount_reimbursed) < cint(doc.total_sanctioned_amount))
cur_frm.add_custom_button(__("Make Bank Entry"),
cur_frm.cscript.make_bank_entry, frappe.boot.doctype_icons["Journal Entry"]);
cur_frm.add_custom_button(__("Bank Entry"),
cur_frm.cscript.make_bank_entry, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
}

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

@@ -10,18 +10,19 @@ frappe.ui.form.on("Job Applicant", {
refresh: function(frm) {
if (!frm.doc.__islocal) {
if (frm.doc.__onload && frm.doc.__onload.offer_letter) {
frm.add_custom_button(__("View Offer Letter"), function() {
frm.add_custom_button(__("Offer Letter"), function() {
frappe.set_route("Form", "Offer Letter", frm.doc.__onload.offer_letter);
});
}, __("View"));
} else {
frm.add_custom_button(__("Make Offer Letter"), function() {
frm.add_custom_button(__("Offer Letter"), function() {
frappe.route_options = {
"job_applicant": frm.doc.name,
"applicant_name": frm.doc.applicant_name,
"designation": frm.doc.job_opening,
};
new_doc("Offer Letter");
});
}, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
}

5
erpnext/hr/doctype/salary_structure/salary_structure.js
View File

@@ -12,8 +12,9 @@ cur_frm.cscript.onload = function(doc, dt, dn){
cur_frm.cscript.refresh = function(doc, dt, dn){
if((!doc.__islocal) && (doc.is_active == 'Yes')){
cur_frm.add_custom_button(__('Make Salary Slip'),
cur_frm.cscript['Make Salary Slip'], frappe.boot.doctype_icons["Salary Slip"]);
cur_frm.add_custom_button(__('Salary Slip'),
cur_frm.cscript['Make Salary Slip'], __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
}