From 4cd0a072900de0beb05525e9ec17e4666076ed9b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 1 Jul 2013 15:17:36 +0530 Subject: [PATCH] [grid-reports] [page] bug fix for double 'show' call, fixed ledger reports links --- accounts/doctype/journal_voucher/journal_voucher.js | 5 ----- accounts/page/general_ledger/general_ledger.js | 3 --- public/js/controllers/stock_controller.js | 13 ++++++------- stock/page/stock_ledger/stock_ledger.js | 3 --- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js index f00ab1f450..dbe666881a 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.js +++ b/accounts/doctype/journal_voucher/journal_voucher.js @@ -56,8 +56,6 @@ cur_frm.cscript.is_opening = function(doc, cdt, cdn) { if (doc.is_opening == 'Yes') unhide_field('aging_date'); } -//Set debit and credit to zero on adding new row -//---------------------------------------------- cur_frm.fields_dict['entries'].grid.onrowadd = function(doc, cdt, cdn){ var d = locals[cdt][cdn]; if(d.idx == 1){ @@ -66,9 +64,6 @@ cur_frm.fields_dict['entries'].grid.onrowadd = function(doc, cdt, cdn){ } } -// Get Outstanding of Payable & Sales Invoice -// ----------------------------------------------- - cur_frm.cscript.against_voucher = function(doc,cdt,cdn) { var d = locals[cdt][cdn]; if (d.against_voucher && !flt(d.debit)) { diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index 3985507e22..769812f506 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -22,10 +22,7 @@ wn.pages['general-ledger'].onload = function(wrapper) { }); erpnext.general_ledger = new erpnext.GeneralLedger(wrapper); - - wrapper.appframe.add_home_breadcrumb() wrapper.appframe.add_module_icon("Accounts") - wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/public/js/controllers/stock_controller.js b/public/js/controllers/stock_controller.js index 15d34e0e33..3021d756b9 100644 --- a/public/js/controllers/stock_controller.js +++ b/public/js/controllers/stock_controller.js @@ -20,13 +20,12 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({ show_stock_ledger: function() { var me = this; this.frm.add_custom_button("Show Stock Ledger", function() { - var args = { - voucher_no: cur_frm.doc.name, - from_date: wn.datetime.str_to_user(cur_frm.doc.posting_date), - to_date: wn.datetime.str_to_user(cur_frm.doc.posting_date) - }; - wn.set_route('stock-ledger', - $.map(args, function(val, key) { return key+"="+val; }).join("&&")); + wn.route_options = { + voucher_no: me.frm.doc.name, + from_date: cur_frm.doc.posting_date, + to_date: cur_frm.doc.posting_date + }; + wn.set_route('stock-ledger'); }, "icon-bar-chart"); } }); \ No newline at end of file diff --git a/stock/page/stock_ledger/stock_ledger.js b/stock/page/stock_ledger/stock_ledger.js index 438f132244..3ca27c5890 100644 --- a/stock/page/stock_ledger/stock_ledger.js +++ b/stock/page/stock_ledger/stock_ledger.js @@ -22,10 +22,7 @@ wn.pages['stock-ledger'].onload = function(wrapper) { }); new erpnext.StockLedger(wrapper); - - wrapper.appframe.add_home_breadcrumb() wrapper.appframe.add_module_icon("Stock") - wrapper.appframe.add_breadcrumb("icon-bar-chart") } wn.require("app/js/stock_grid_report.js");