fix in general ledger report: account filter options to be filtered by company

erpnext/accounts/page/general_ledger/general_ledger.js

@@ -21,13 +21,20 @@ wn.pages['general-ledger'].onload = function(wrapper) {
 		single_column: true
 	});
 	
-	erpnext.general_ledger = new wn.views.GridReport({
+	erpnext.general_ledger = new erpnext.GeneralLedger(wrapper);
+
+}
+
+erpnext.GeneralLedger = wn.views.GridReport.extend({
+	init: function(wrapper) {
+		this._super({
 			title: "General Ledger",
 			page: wrapper,
 			parent: $(wrapper).find('.layout-main'),
 			appframe: wrapper.appframe,
 			doctypes: ["Company", "Account", "GL Entry", "Cost Center"],
-
+		});
+	},
 	setup_columns: function() {
 		this.columns = [
 			{id: "posting_date", name: "Posting Date", field: "posting_date", width: 100,
@@ -83,6 +90,40 @@ wn.pages['general-ledger'].onload = function(wrapper) {
 		{fieldtype:"Button", label: "Refresh", icon:"icon-refresh icon-white", cssClass:"btn-info"},
 		{fieldtype:"Button", label: "Reset Filters"}
 	],
+	setup_filters: function() {
+		this._super();
+		var me = this;
+		
+		// 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;
+			$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;
+				})));
+			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();
+	},
+	make_accounts_by_company: function() {
+		var accounts_by_company = {};
+		var me = this;
+		$.each(wn.report_dump.data["Account"], function(i, ac) {
+			if(!accounts_by_company[ac.company]) accounts_by_company[ac.company] = [];
+			accounts_by_company[ac.company].push(ac.name);
+		});
+		return accounts_by_company;
+	},
 	is_child_account: function(account, item_account) {
 		account = this.account_by_name[account];
 		item_account = this.account_by_name[item_account];
@@ -118,9 +159,9 @@ wn.pages['general-ledger'].onload = function(wrapper) {
 		}
 		
 		$.each(data, function(i, item) {
-				if((!me.is_default("account") ? me.is_child_account(me.account, item.account) : true) && 
+			if((me.is_default("company") ? true : me.apply_filter(item, "company")) &&
-					(me.voucher_no ? item.voucher_no==me.voucher_no : true)) {
+				(!me.is_default("account") ? me.is_child_account(me.account, item.account) 
-
+				: true) && (me.voucher_no ? item.voucher_no==me.voucher_no : true)) {
 				var date = dateutil.str_to_obj(item.posting_date);
 				
 				if(date < from_date) {
@@ -194,6 +235,3 @@ wn.pages['general-ledger'].onload = function(wrapper) {
 		}
 	},
 });
-
-}
-

erpnext/startup/report_data_map.py

@@ -31,8 +31,8 @@ data_map = {
 
 	# Accounts
 	"Account": {
-		"columns": ["name", "parent_account", "lft", "rgt", "debit_or_credit", "is_pl_account",
+		"columns": ["name", "parent_account", "lft", "rgt", "debit_or_credit", 
-			"company"],
+			"is_pl_account", "company"],
 		"order_by": "lft"
 	},
 	"Cost Center": {

erpnext/stock/page/stock_ledger/stock_ledger.js

@@ -175,8 +175,8 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
 		if(me.item_code != me.item_code_default && !me.voucher_no) {
 			var closing = {
 				item_code: "On " + dateutil.str_to_user(this.to_date), 
-				balance: (out ? out[out.length-1].balance : 0), qty: 0,
+				balance: (out.length ? out[out.length-1].balance : 0), qty: 0,
-				balance_value: (out ? out[out.length-1].balance_value : 0),
+				balance_value: (out.length ? out[out.length-1].balance_value : 0),
 				id:"_closing", _show: true, _style: "font-weight: bold"
 			};
 			total_out.balance_value = -total_out.balance_value;

public/js/all-app.js

@@ -1088,7 +1088,7 @@ me.filter_inputs[v.fieldname]=input;});},make_waiting:function(){this.waiting=$(
    <div class="progress progress-striped active">\
     <div class="bar" style="width: 10%"></div></div>').appendTo(this.wrapper);},load_filter_values:function(){var me=this;$.each(this.filter_inputs,function(i,f){var opts=f.get(0).opts;if(opts.fieldtype!='Button'){me[opts.fieldname]=f.val();if(opts.fieldtype=="Date"){me[opts.fieldname]=dateutil.user_to_str(me[opts.fieldname]);}else if(opts.fieldtype=="Select"){me[opts.fieldname+'_default']=opts.default_value;}}});if(this.filter_inputs.from_date&&this.filter_inputs.to_date&&(this.to_date<this.from_date)){msgprint("From Date must be before To Date");return;}},make_name_map:function(data,key){var map={};key=key||"name";$.each(data,function(i,v){map[v[key]]=v;})
 return map;},reset_item_values:function(item){var me=this;$.each(this.columns,function(i,col){if(col.formatter==me.currency_formatter){item[col.id]=0;}});},import_slickgrid:function(){wn.require('js/lib/slickgrid/slick.grid.css');wn.require('js/lib/slickgrid/slick-default-theme.css');wn.require('js/lib/slickgrid/jquery.event.drag.min.js');wn.require('js/lib/slickgrid/slick.core.js');wn.require('js/lib/slickgrid/slick.grid.js');wn.require('js/lib/slickgrid/slick.dataview.js');wn.dom.set_style('.slick-cell { font-size: 12px; }');if(this.tree_grid.show)wn.require("js/app/tree_grid.css");},refresh:function(){this.waiting.toggle(false);if(!this.grid_wrapper)
-this.make();this.show_zero=$('.show-zero input:checked').length;this.load_filter_values();this.setup_columns();this.setup_dataview_columns();this.apply_link_formatters();this.prepare_data();this.prepare_data_view();this.wrapper.find(".processing").toggle(true);this.wrapper.find(".processing").delay(2000).fadeOut(300);this.render();this.render_plot();},setup_dataview_columns:function(){this.dataview_columns=$.map(this.columns,function(col){return!col.hidden?col:null;});},make:function(){this.plot_area=$('<div class="plot" style="margin-bottom: 15px; display: none; \
+this.make();this.show_zero=$('.show-zero input:checked').length;this.load_filter_values();this.setup_columns();this.setup_dataview_columns();this.apply_link_formatters();this.prepare_data();this.prepare_data_view();this.wrapper.find(".processing").toggle(true);this.wrapper.find(".processing").delay(2000).fadeOut(300);this.render();this.render_plot&&this.render_plot();},setup_dataview_columns:function(){this.dataview_columns=$.map(this.columns,function(col){return!col.hidden?col:null;});},make:function(){this.plot_area=$('<div class="plot" style="margin-bottom: 15px; display: none; \
    height: 300px; width: 100%;"></div>').appendTo(this.wrapper);$('<div style="text-align: right;"> \
    <div class="processing" style="background-color: #fec; display: none; float: left; margin: 2px"> \
     Updated! </div>\