schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with 3.3.8

Browse Source
This commit is contained in:
Rushabh Mehta
2013-12-26 11:07:46 +05:30
parent 4b6b377134 9a064e9ced
commit 54047780fc
77 changed files with 700 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,9 +11,10 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({
wn.route_options = {
voucher_no: me.frm.doc.name,
from_date: me.frm.doc.posting_date,
to_date: me.frm.doc.posting_date
to_date: me.frm.doc.posting_date,
company: me.frm.doc.company
};
wn.set_route('stock-ledger');
wn.set_route("query-report", "Stock Ledger");
}, "icon-bar-chart");
}
@@ -24,11 +25,12 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({
if(this.frm.doc.docstatus===1 && cint(wn.defaults.get_default("auto_accounting_for_stock"))) {
cur_frm.appframe.add_button(wn._('Accounting Ledger'), function() {
wn.route_options = {
"voucher_no": me.frm.doc.name,
"from_date": me.frm.doc.posting_date,
"to_date": me.frm.doc.posting_date,
voucher_no: me.frm.doc.name,
from_date: me.frm.doc.posting_date,
to_date: me.frm.doc.posting_date,
company: me.frm.doc.company
};
wn.set_route("general-ledger");
wn.set_route("query-report", "General Ledger");
}, "icon-table");
}
},