[MERGE] forward port branch saas-6 up to fa50349

2016-10-17 13:14:22 +02:00
parent 2ce7679032 fa50349d7e
commit b14c8b361c
4 changed files with 14 additions and 18 deletions
@@ -1851,7 +1851,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 {};