Ver código fonte

totals row not popped properly

version-14
Zlash65 7 anos atrás
pai
commit
6f66e6338a
1 arquivos alterados com 12 adições e 5 exclusões
  1. +12
    -5
      frappe/public/js/frappe/views/reports/reportview.js

+ 12
- 5
frappe/public/js/frappe/views/reports/reportview.js Ver arquivo

@@ -624,17 +624,24 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
this.data.pop(); this.data.pop();
} }


var total_flag = "";
if(this.add_totals_row) { if(this.add_totals_row) {
var totals_row = {_totals_row: 1}; var totals_row = {_totals_row: 1};
if(this.data.length) { if(this.data.length) {
this.data.forEach(function(row, ri) { 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); this.data.push(totals_row);
} }
}, },


Carregando…
Cancelar
Salvar