From dd4a3b80479bbe974a71a4d269abe237b52e31c6 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 7 Jun 2011 16:42:15 +0200 Subject: [PATCH] [IMP] mandate that @group_operator and listwise aggregation functions be coherent on a listview field, so we can aggregate groups correctly bzr revid: xmo@openerp.com-20110607144215-g6beueaoo3tu350r --- addons/base/static/src/js/list.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js index 64282c51a43..60aa252cedb 100644 --- a/addons/base/static/src/js/list.js +++ b/addons/base/static/src/js/list.js @@ -203,15 +203,20 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi this.aggregate_columns = _(this.visible_columns) .map(function (column) { - if (!(column['sum'] || column['avg'])) { + if (column.type !== 'integer' && column.type !== 'float') { return {}; } - var func = column['sum'] ? 'sum' : 'avg'; + var aggregation_func = column['group_operator'] || 'sum'; + + if (!column[aggregation_func]) { + return {}; + } + return { field: column.id, type: column.type, - 'function': func, - label: column[func] + 'function': aggregation_func, + label: column[aggregation_func] }; }); },