nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +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/public/js/controllers/stock_controller.js
View File

@@ -29,7 +29,7 @@ erpnext.stock.StockController = frappe.ui.form.Controller.extend({
company: me.frm.doc.company
};
frappe.set_route("query-report", "Stock Ledger");
}, "icon-bar-chart");
}, __("View"));
}
},
@@ -46,7 +46,7 @@ erpnext.stock.StockController = frappe.ui.form.Controller.extend({
group_by_voucher: false
};
frappe.set_route("query-report", "General Ledger");
}, "icon-table");
}, __("View"));
}
}
});

4
erpnext/public/js/controllers/transaction.js
View File

@@ -133,14 +133,14 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var me = this;
if (in_list(["Purchase Invoice", "Sales Invoice"], this.frm.doctype)) {
if(this.frm.doc.outstanding_amount !== this.frm.doc.base_grand_total) {
this.frm.add_custom_button(__("Show Payments"), function() {
this.frm.add_custom_button(__("Payments"), function() {
frappe.route_options = {
"Journal Entry Account.reference_type": me.frm.doc.doctype,
"Journal Entry Account.reference_name": me.frm.doc.name
};
frappe.set_route("List", "Journal Entry");
});
}, __("View"));
}
}
},