From 6f66e6338a3aa22622cc3a8349db9013c47c7dae Mon Sep 17 00:00:00 2001 From: Zlash65 Date: Tue, 26 Sep 2017 10:32:45 +0530 Subject: [PATCH 1/2] totals row not popped properly --- .../js/frappe/views/reports/reportview.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/reportview.js b/frappe/public/js/frappe/views/reports/reportview.js index b7fd287b02..8fd8713d39 100644 --- a/frappe/public/js/frappe/views/reports/reportview.js +++ b/frappe/public/js/frappe/views/reports/reportview.js @@ -624,17 +624,24 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({ this.data.pop(); } + var total_flag = ""; 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 && !total_flag) + total_flag = ri; + else { + $.each(row, function(key, value) { + if($.isNumeric(value)) { + totals_row[key] = (totals_row[key] || 0) + value; + } + }); + } }); } + if(total_flag) + this.data.splice(total_flag, 1); this.data.push(totals_row); } }, From 4ece079f9685c2ad2f080eebf6c98830a6531185 Mon Sep 17 00:00:00 2001 From: Zlash65 Date: Tue, 26 Sep 2017 12:43:47 +0530 Subject: [PATCH 2/2] requested changes done --- frappe/public/js/frappe/views/reports/reportview.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/reportview.js b/frappe/public/js/frappe/views/reports/reportview.js index 8fd8713d39..4544b6cf4c 100644 --- a/frappe/public/js/frappe/views/reports/reportview.js +++ b/frappe/public/js/frappe/views/reports/reportview.js @@ -624,13 +624,14 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({ this.data.pop(); } - var total_flag = ""; + 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) { - if(row._totals_row && !total_flag) - total_flag = ri; + if(row._totals_row && !existing_total_row) { + existing_total_row = ri; + } else { $.each(row, function(key, value) { if($.isNumeric(value)) { @@ -640,8 +641,9 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({ } }); } - if(total_flag) - this.data.splice(total_flag, 1); + if(existing_total_row) { + this.data.splice(existing_total_row, 1); + } this.data.push(totals_row); } },