nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt
This commit is contained in:
Anand Doshi
2013-07-09 13:10:15 +05:30
parent bdee6e074a 0f3d2df8e8
commit c120776931
22 changed files with 126 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/js/controllers/stock_controller.js
View File

@@ -19,7 +19,7 @@ wn.provide("erpnext.stock");
erpnext.stock.StockController = wn.ui.form.Controller.extend({
show_stock_ledger: function() {
var me = this;
this.frm.add_custom_button("Show Stock Ledger", function() {
this.frm.add_custom_button("Stock Ledger", function() {
wn.route_options = {
voucher_no: me.frm.doc.name,
from_date: cur_frm.doc.posting_date,
@@ -27,5 +27,17 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({
};
wn.set_route('stock-ledger');
}, "icon-bar-chart");
},
show_general_ledger: function() {
if(doc.docstatus==1) {
cur_frm.add_custom_button('Accounting Ledger', function() {
wn.route_options = {
"voucher_no": doc.name,
"from_date": doc.posting_date,
"to_date": doc.posting_date,
};
wn.set_route("general-ledger");
});
}
}
});