Merge branch 'master' into staging

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '9.0.7'
+__version__ = '9.0.8'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/public/js/frappe/views/reports/query_report.js

@@ -591,7 +591,7 @@ frappe.views.QueryReport = Class.extend({
 			newrow.id = newrow.name ? newrow.name : ("_" + newrow._id);
 			this.data.push(newrow);
 		}
-		if(this.report_doc.add_total_row) {
+		if(this.data.length && this.report_doc.add_total_row) {
 			this.total_row_id = this.data[this.data.length - 1].id;
 		}
 	},