diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index ecc8626a8b7..d9fb4bb0ce4 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -104,23 +104,40 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ 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( + var default_account = $filter.get(0).opts.default_value; + var new_options = [default_account].concat( $.map(wn.report_dump.data["Account"], function(ac) { return (company===default_company || accounts_by_company[company].indexOf(ac.name)!=-1) ? ac.name : null; - }))); + })); + var old_account = me.filter_inputs.account.val(); + + $filter.empty().add_options(new_options); + + if((old_account != default_account) && new_options.indexOf(old_account)!=-1) { + $filter.val(old_account); + } + + // chosen + $filter.trigger("liszt:updated"); + me.filter_inputs.refresh.click(); }); this.filter_inputs.account && this.filter_inputs.account.change(function() { me.filter_inputs.refresh.click(); }); + }, init_filter_values: function() { this._super(); this.filter_inputs.company.change(); }, + apply_filters_from_route: function() { + this._super(); + this.filter_inputs.company.change(); + }, make_accounts_by_company: function() { var accounts_by_company = {}; var me = this; @@ -134,7 +151,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ account = this.account_by_name[account]; item_account = this.account_by_name[item_account]; - return (item_account.lft >= account.lft && item_account.rgt <= account.rgt) + return ((item_account.lft >= account.lft) && (item_account.rgt <= account.rgt)); }, prepare_data: function() { // add Opening, Closing, Totals rows diff --git a/home/page/attributions/attributions.html b/home/page/attributions/attributions.html index 9952908eda9..113b969c133 100644 --- a/home/page/attributions/attributions.html +++ b/home/page/attributions/attributions.html @@ -40,10 +40,14 @@
  • Ace - code editor
  • Slick Grid - report grid
  • jQPlot - graphs
  • -
  • JQuery.Gantt - Gantt Chart
  • +
  • + JQuery.Gantt - Gantt Chart
  • JSON2 - JSON builder, parser
  • JSColor - color picker
  • -
  • Downloadify - Export CSV files from the browser
  • +
  • + Downloadify - Export CSV files from the browser
  • +
  • + Chosen - a searchable select dropdown