summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-10-17 15:17:48 +0200
committerChristophe Simonis <chs@odoo.com>2016-10-17 15:17:48 +0200
commite8e4145c998c335d00a48a0b2a7a9e961b3f3983 (patch)
tree3433987f901989e6103f30d165580a87ce4f658f /addons/web/static/src/js/views
parent81ec36a709188e1e8fe0fb28e0673396d9b51e4d (diff)
parentba6ca788fd80a1b963b8059bd287317399389283 (diff)
[MERGE] forward port branch saas-11 up to ba6ca78
Diffstat (limited to 'addons/web/static/src/js/views')
-rw-r--r--addons/web/static/src/js/views/list_view.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index 39aa8930eac..aece38b9d71 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -1733,7 +1733,7 @@ var Column = Class.extend({
}
var aggregation_func = (this.sum && 'sum') || (this.avg && 'avg') ||
- (this.max && 'max') || (this.min && 'min') || this.group_operator;
+ (this.max && 'max') || (this.min && 'min');
if (!aggregation_func) {
return {};