diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 8d03823db6..82779d83f3 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -27,7 +27,7 @@ frappe.form.formatters = {
 	},
 	Currency: function(value, docfield, options, doc) {
 		var currency = frappe.meta.get_field_currency(docfield, doc);
-		return "<div style='text-align: right'>" + format_currency(value, currency) + "</div>";
+		return "<div style='text-align: right'>" + ((value==null || value==="") ? "" : format_currency(value, currency)) + "</div>";
 	},
 	Check: function(value) {
 		return value ? "<i class='icon-check'></i>" : "<i class='icon-check-empty'></i>";
diff --git a/frappe/public/js/frappe/views/query_report.js b/frappe/public/js/frappe/views/query_report.js
index 47595440cd..a610e229ec 100644
--- a/frappe/public/js/frappe/views/query_report.js
+++ b/frappe/public/js/frappe/views/query_report.js
@@ -213,12 +213,18 @@ frappe.views.QueryReport = Class.extend({
 	},
 	refresh: function() {
 		// Run
-		var me =this;
+		var me = this;
 		this.waiting = frappe.messages.waiting(this.wrapper.find(".waiting-area").empty().toggle(true),
 			"Loading Report...");
 		this.wrapper.find(".results").toggle(false);
 		var filters = this.get_values(true);
-		return frappe.call({
+
+		if (this.report_ajax) {
+			// report previous request
+			this.report_ajax.abort();
+		}
+
+		this.report_ajax = frappe.call({
 			method: "frappe.widgets.query_report.run",
 			type: "GET",
 			args: {
@@ -290,60 +296,77 @@ frappe.views.QueryReport = Class.extend({
 		this.setup_sort();
 	},
 	make_columns: function(columns) {
+		var me = this;
+		var formatter = this.get_formatter();
+
 		this.columns = [{id: "_id", field: "_id", name: "Sr No", width: 60}]
 			.concat($.map(columns, function(c) {
-				var col = {name:c, id: c, field: c, sortable: true, width: 80}
-
-				if(c.indexOf(":")!=-1) {
+				if ($.isPlainObject(c)) {
+					var df = c;
+				} else if (c.indexOf(":")!==-1) {
 					var opts = c.split(":");
 					var df = {
 						label: opts.length<=2 ? opts[0] : opts.slice(0, opts.length - 2).join(":"),
 						fieldtype: opts.length<=2 ? opts[1] : opts[opts.length - 2],
 						width: opts.length<=2 ? opts[2] : opts[opts.length - 1]
-					}
-
-					if(!df.fieldtype)
-						df.fieldtype="Data";
-
-					if(df.fieldtype.indexOf("/")!=-1) {
+					};
+					if (df.fieldtype.indexOf("/")!==-1) {
 						var tmp = df.fieldtype.split("/");
 						df.fieldtype = tmp[0];
 						df.options = tmp[1];
 					}
-
-					col.df = df;
-					col.formatter = function(row, cell, value, columnDef, dataContext) {
-						return frappe.format(value, columnDef.df, null, dataContext);
-					}
-
-					// column parameters
-					col.name = col.id = col.field = df.label;
-					col.name = __(df.label);
-					col.fieldtype = opts[1];
-
-					// width
-					if(df.width) {
-						col.width=parseInt(df.width);
-					}
+					df.width = cint(df.width);
 				} else {
-					col.df = {
+					var df = {
 						label: c,
 						fieldtype: "Data"
-					}
+					};
 				}
-				col.name = __(toTitle(col.name.replace(/_/g, " ")))
+
+				if (!df.fieldtype) df.fieldtype = "Data";
+				if (!cint(df.width)) df.width = 80;
+
+				var col = $.extend({}, df, {
+					label: df.label || __(toTitle(df.fieldname.replace(/_/g, " "))),
+					sortable: true,
+					df: df,
+					formatter: formatter
+				});
+
+				col.field = df.fieldname || df.label.replace(/ /g, "_");
+				df.label = __(df.label);
+				col.name = col.id = col.label = df.label;
+
 				return col
 		}));
 	},
+	get_formatter: function() {
+		var formatter = function(row, cell, value, columnDef, dataContext) {
+			return frappe.format(value, columnDef.df, null, dataContext);
+		};
+
+		var query_report_opts = frappe.query_reports[this.report_name];
+		if (query_report_opts && query_report_opts.formatter) {
+			// custom formatter
+			query_report_opts["default_formatter"] = formatter;
+			formatter = query_report_opts.formatter;
+		}
+
+		return formatter;
+	},
 	make_data: function(result, columns) {
 		var me = this;
 		this.data = [];
 		for(var row_idx=0, l=result.length; row_idx < l; row_idx++) {
 			var row = result[row_idx];
-			var newrow = {};
-			for(var i=1, j=this.columns.length; i<j; i++) {
-				newrow[this.columns[i].field] = row[i-1];
-			};
+			if ($.isPlainObject(row)) {
+				var newrow = row;
+			} else {
+				var newrow = {};
+				for(var i=1, j=this.columns.length; i<j; i++) {
+					newrow[this.columns[i].field] = row[i-1];
+				};
+			}
 			newrow._id = row_idx + 1;
 			newrow.id = newrow.name ? newrow.name : ("_" + newrow._id);
 			this.data.push(newrow);
diff --git a/frappe/widgets/query_report.py b/frappe/widgets/query_report.py
index 8d1b859870..bd7cb196b7 100644
--- a/frappe/widgets/query_report.py
+++ b/frappe/widgets/query_report.py
@@ -100,18 +100,31 @@ def add_total_row(result, columns):
 	has_percent = []
 	for row in result:
 		for i, col in enumerate(columns):
-			col = col.split(":")
-			if len(col) > 1:
-				if col[1] in ["Currency", "Int", "Float", "Percent"] and flt(row[i]):
-					total_row[i] = flt(total_row[i]) + flt(row[i])
-				if col[1] == "Percent" and i not in has_percent:
-					has_percent.append(i)
+			fieldtype = None
+			if isinstance(col, basestring):
+				col = col.split(":")
+				if len(col) > 1:
+					fieldtype = col[1]
+			else:
+				fieldtype = col.get("fieldtype")
+
+			if fieldtype in ["Currency", "Int", "Float", "Percent"] and flt(row[i]):
+				total_row[i] = flt(total_row[i]) + flt(row[i])
+			if fieldtype == "Percent" and i not in has_percent:
+				has_percent.append(i)
 
 	for i in has_percent:
 		total_row[i] = total_row[i] / len(result)
 
-	first_col = columns[0].split(":")
-	if len(first_col) > 1 and first_col[1] not in ["Currency", "Int", "Float", "Percent"]:
+	first_col_fieldtype = None
+	if isinstance(columns[0], basestring):
+		first_col = columns[0].split(":")
+		if len(first_col) > 1:
+			first_col_fieldtype = first_col[1]
+	else:
+		first_col_fieldtype = columns[0].get("fieldtype")
+
+	if first_col_fieldtype not in ["Currency", "Int", "Float", "Percent"]:
 		total_row[0] = "Total"
 
 	result.append(total_row)
@@ -146,10 +159,15 @@ def get_linked_doctypes(columns):
 	linked_doctypes = {}
 
 	for idx, col in enumerate(columns):
-		col = col.split(":")
-		if len(col) > 1 and col[1].startswith("Link"):
-			link_dt = col[1].split("/")[1]
-			linked_doctypes[link_dt] = idx
+		if isinstance(col, basestring):
+			col = col.split(":")
+			if len(col) > 1 and col[1].startswith("Link"):
+				link_dt = col[1].split("/")[1]
+				linked_doctypes[link_dt] = idx
+
+		# dict
+		elif col.get("fieldtype")=="Link" and col.get("options"):
+			linked_doctypes[col["options"]] = idx
 
 	return linked_doctypes
 
diff --git a/requirements.txt b/requirements.txt
index f3fb7545b1..59a62f563b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,3 +22,4 @@ celery
 redis
 selenium
 pdfkit
+babel