Merge pull request #4186 from Zlash65/report-builder

[ Fix ] Totals row not popped before appending more data

frappe/public/js/frappe/views/reports/reportview.js

@@ -624,17 +624,26 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
 			this.data.pop();
 		}
 
+		var existing_total_row = null;
 		if(this.add_totals_row) {
 			var totals_row = {_totals_row: 1};
 			if(this.data.length) {
 				this.data.forEach(function(row, ri) {
-					$.each(row, function(key, value) {
-						if($.isNumeric(value)) {
-							totals_row[key] = (totals_row[key] || 0) + value;
-						}
-					});
+					if(row._totals_row && !existing_total_row) {
+						existing_total_row = ri;
+					}
+					else {
+						$.each(row, function(key, value) {
+							if($.isNumeric(value)) {
+								totals_row[key] = (totals_row[key] || 0) + value;
+							}
+						});
+					}
 				});
 			}
+			if(existing_total_row) {
+				this.data.splice(existing_total_row, 1);
+			}
 			this.data.push(totals_row);
 		}
 	},