vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

requested changes done

Browse source
This commit is contained in:
Zlash65 2017-09-26 12:43:47 +05:30
parent 6f66e6338a
commit 4ece079f96
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/public/js/frappe/views/reports/reportview.js
View file

@ -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);
}
},