diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js index fafeb8428d9..93201843633 100644 --- a/addons/web/static/src/js/views/pivot/pivot_model.js +++ b/addons/web/static/src/js/views/pivot/pivot_model.js @@ -78,9 +78,6 @@ var PivotModel = AbstractModel.extend({ var type = self.fields[measure].type; return (type === 'many2one') ? measure + ":count_distinct" : measure; }); - var fields = _.map(other_groupbys, function (field) { - return field.split(':')[0]; - }); var groupbys = []; @@ -94,7 +91,7 @@ var PivotModel = AbstractModel.extend({ method: 'read_group', context: self.data.context, domain: header.domain.length ? header.domain : self.data.domain, - fields: [].concat(field, fields, measures), + fields: measures, groupBy: groupBy, lazy: false, }); @@ -551,9 +548,6 @@ var PivotModel = AbstractModel.extend({ return measure; } }); - var fields = _.map(rowGroupBys.concat(colGroupBys), function (field) { - return field.split(':')[0]; - }).concat(measures); for (var i = 0; i < rowGroupBys.length + 1; i++) { for (var j = 0; j < colGroupBys.length + 1; j++) { @@ -567,7 +561,7 @@ var PivotModel = AbstractModel.extend({ method: 'read_group', context: self.data.context, domain: self.data.domain, - fields: fields, + fields: measures, groupBy: groupBy, lazy: false, }); diff --git a/addons/web/static/tests/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js index a86ba3c28a6..77c1c66fae8 100644 --- a/addons/web/static/tests/views/pivot_tests.js +++ b/addons/web/static/tests/views/pivot_tests.js @@ -1034,7 +1034,7 @@ QUnit.module('Views', { '', }); pivot.$('tbody .o_pivot_header_cell_closed').first().click(); - // click on date by day + // click on date by month pivot.$('ul.o_pivot_field_menu > li[data-field="date"] a[data-interval="month"]').click(); assert.strictEqual(pivot.$('.o_pivot_cell_value').text(), '2211', @@ -1083,5 +1083,4 @@ QUnit.module('Views', { 'should have loaded the proper data'); pivot.destroy(); }); - });});