From 4627867786a5539338112fb11924dceb89ba511b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 24 Sep 2012 18:16:52 +0530 Subject: [PATCH] fix in general ledger report: account filter options to be filtered by company --- erpnext/accounts/page/general_ledger/general_ledger.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/page/general_ledger/general_ledger.js b/erpnext/accounts/page/general_ledger/general_ledger.js index fce7a20137..eca9dea97a 100644 --- a/erpnext/accounts/page/general_ledger/general_ledger.js +++ b/erpnext/accounts/page/general_ledger/general_ledger.js @@ -97,12 +97,13 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ // filter accounts options by company var accounts_by_company = this.make_accounts_by_company(); this.filter_inputs.company && this.filter_inputs.company.change(function() { - var company = $(this).val(); var $filter = me.filter_inputs.account; + var company = $(this).val(); + var default_company = me.filter_inputs.company.get(0).opts.default_value; $filter.empty().add_options([$filter.get(0).opts.default_value].concat( $.map(wn.report_dump.data["Account"], function(ac) { - return accounts_by_company[company].indexOf(ac.name)!=-1 - ? ac.name : null; + return (accounts_by_company[company].indexOf(ac.name)!=-1 || + company===default_company) ? ac.name : null; }))); me.filter_inputs.refresh.click(); });