moved chart_of_accounts as GridReport

js/wn/ui/appframe.js

@@ -20,7 +20,7 @@ wn.ui.AppFrame = Class.extend({
 		this.add_breadcrumb(txt);
 	},
 	add_button: function(label, click, icon) {
-		this.make_toolbar();
+		this.add_toolbar();
 		args = { label: label, icon:'' };
 		if(icon) {
 			args.icon = '<i class="icon '+icon+'"></i>';
@@ -32,7 +32,7 @@ wn.ui.AppFrame = Class.extend({
 		return this.buttons[label];
 	},
 	add_help_button: function(txt) {
-		this.make_toolbar();
+		this.add_toolbar();
 		$('<button class="btn btn-small" style="float:right;" button-type="help">\
 			<b>?</b></button>')
 			.data('help-text', txt)
@@ -58,7 +58,7 @@ wn.ui.AppFrame = Class.extend({
 	clear_breadcrumbs: function() {
 		this.$breadcrumbs && this.$breadcrumbs.empty();
 	},
-	make_toolbar: function() {
+	add_toolbar: function() {
 		if(!this.toolbar)
 			this.$w.append('<div class="appframe-toolbar"></div>');
 		this.toolbar = this.$w.find('.appframe-toolbar');

js/wn/views/grid_report.js

@@ -208,17 +208,20 @@ wn.views.GridReport = Class.extend({
 		this.prepare_data();
 		
 		this.grid = new Slick.Grid("#"+this.id, this.dataView, this.columns, this.options);
+		var me = this;
 
 		// bind events
 		this.dataView.onRowsChanged.subscribe(function (e, args) {
-			grid.invalidateRows(args.rows);
-			grid.render();
+			me.grid.invalidateRows(args.rows);
+			me.grid.render();
 		});
 		
 		this.dataView.onRowCountChanged.subscribe(function (e, args) {
-			grid.updateRowCount();
-			grid.render();
+			me.grid.updateRowCount();
+			me.grid.render();
 		});
+		
+		this.add_grid_events && this.add_grid_events();
 	},
 	prepare_data_view: function(items) {
 		// initialize the model
@@ -278,6 +281,8 @@ wn.views.GridReport = Class.extend({
 		enableColumnReorder: false
 	},
 	dataview_filter: function(item) {
+		// generic filter: apply filter functiions
+		// from all filter_inputs
 		var filters = wn.cur_grid_report.filter_inputs;
 		for (i in filters) {
 			var filter = filters[i].get(0);
@@ -285,6 +290,12 @@ wn.views.GridReport = Class.extend({
 				return false;
 			}
 		}
+		
+		// hand over to additional filters (if applicable)
+		if(wn.cur_grid_report.custom_dataview_filter) {
+			return wn.cur_grid_report.custom_dataview_filter(item);
+		}
+		
 		return true;
 	},
 	date_formatter: function(row, cell, value, columnDef, dataContext) {

py/webnotes/widgets/report_dump.py

@@ -34,7 +34,7 @@ def get_data():
 		conditions = order_by = ""
 		if args.get("conditions"):
 			conditions = " where " + " and ".join(args["conditions"])
-		if args.get("order by"):
+		if args.get("order_by"):
 			order_by = " order by " + args["order_by"]
 		
 		out[d] = {}