nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-30 23:18:02 +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

4
erpnext/support/doctype/issue/issue.js
View File

@@ -8,12 +8,12 @@ frappe.ui.form.on("Issue", {
frm.add_custom_button(__("Close"), function() {
frm.set_value("status", "Closed");
frm.save();
});
}, __("Status"));
} else {
frm.add_custom_button(__("Reopen"), function() {
frm.set_value("status", "Open");
frm.save();
});
}, __("Status"));
}
}
});

6
erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
View File

@@ -16,7 +16,7 @@ erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({
var me = this;
if (this.frm.doc.docstatus === 0) {
this.frm.add_custom_button(__('From Sales Order'),
this.frm.add_custom_button(__('Sales Order'),
function() {
frappe.model.map_current_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule",
@@ -28,7 +28,7 @@ erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({
company: me.frm.doc.company
}
});
}, "icon-download", "btn-default");
}, __("From"));
} else if (this.frm.doc.docstatus === 1) {
this.frm.add_custom_button(__("Make Maintenance Visit"), function() {
frappe.model.open_mapped_doc({
@@ -36,7 +36,7 @@ erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({
source_name: me.frm.doc.name,
frm: me.frm
})
}, frappe.boot.doctype_icons["Maintenance Visit"]);
}, __("Make"));
}
},

12
erpnext/support/doctype/maintenance_visit/maintenance_visit.js
View File

@@ -15,7 +15,7 @@ frappe.ui.form.on_change("Maintenance Visit", "contact_person",
erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
refresh: function() {
if (this.frm.doc.docstatus===0) {
cur_frm.add_custom_button(__('From Maintenance Schedule'),
cur_frm.add_custom_button(__('Maintenance Schedule'),
function() {
frappe.model.map_current_doc({
method: "erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
@@ -26,8 +26,8 @@ erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
company: cur_frm.doc.company
}
})
}, "icon-download", "btn-default");
cur_frm.add_custom_button(__('From Warranty Claim'),
}, __("From"));
cur_frm.add_custom_button(__('Warranty Claim'),
function() {
frappe.model.map_current_doc({
method: "erpnext.support.doctype.warranty_claim.warranty_claim.make_maintenance_visit",
@@ -38,8 +38,8 @@ erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
company: cur_frm.doc.company
}
})
}, "icon-download", "btn-default");
cur_frm.add_custom_button(__('From Sales Order'),
}, __("From"));
cur_frm.add_custom_button(__('Sales Order'),
function() {
frappe.model.map_current_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
@@ -51,7 +51,7 @@ erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
company: cur_frm.doc.company
}
})
}, "icon-download", "btn-default");
}, __("From"));
}
},
});

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

@@ -15,8 +15,9 @@ erpnext.support.WarrantyClaim = frappe.ui.form.Controller.extend({
refresh: function() {
if(!cur_frm.doc.__islocal &&
(cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
cur_frm.add_custom_button(__('Make Maintenance Visit'),
this.make_maintenance_visit, frappe.boot.doctype_icons["Maintenance Visit"], "btn-default")
cur_frm.add_custom_button(__('Maintenance Visit'),
this.make_maintenance_visit, __("Make"))
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
},