diff --git a/addons/spreadsheet/static/src/pivot/pivot_data_source.js b/addons/spreadsheet/static/src/pivot/pivot_data_source.js index 307480437a5..3393723b705 100644 --- a/addons/spreadsheet/static/src/pivot/pivot_data_source.js +++ b/addons/spreadsheet/static/src/pivot/pivot_data_source.js @@ -51,11 +51,6 @@ export default class PivotDataSource extends OdooViewsDataSource { return model; } - getReportMeasures() { - this._assertDataIsLoaded(); - return this._model.getReportMeasures(); - } - /** * @param {string[]} domain */ diff --git a/addons/spreadsheet/static/src/pivot/pivot_functions.js b/addons/spreadsheet/static/src/pivot/pivot_functions.js index 7a6380a7128..980dc7f254d 100644 --- a/addons/spreadsheet/static/src/pivot/pivot_functions.js +++ b/addons/spreadsheet/static/src/pivot/pivot_functions.js @@ -68,7 +68,7 @@ const ODOO_PIVOT = { computeFormat: function (pivotId, measureName, ...domain) { pivotId = toString(pivotId.value); const measure = toString(measureName.value); - const field = this.getters.getPivotDataSource(pivotId).getReportMeasures()[measure]; + const field = this.getters.getPivotDataSource(pivotId).getField(measure); if (!field) { return undefined; } diff --git a/addons/spreadsheet/static/src/pivot/pivot_model.js b/addons/spreadsheet/static/src/pivot/pivot_model.js index 9c24d76ea6a..b90e5413289 100644 --- a/addons/spreadsheet/static/src/pivot/pivot_model.js +++ b/addons/spreadsheet/static/src/pivot/pivot_model.js @@ -4,7 +4,6 @@ import { _t } from "@web/core/l10n/translation"; import { Domain } from "@web/core/domain"; import { sprintf } from "@web/core/utils/strings"; import { PivotModel } from "@web/views/pivot/pivot_model"; -import { computeReportMeasures } from "@web/views/utils"; import * as spreadsheet from "@odoo/o-spreadsheet"; import { PERIODS } from "@spreadsheet/pivot/pivot_helpers"; @@ -201,10 +200,6 @@ export class SpreadsheetPivotModel extends PivotModel { return field.string + (aggregateOperator ? ` (${PERIODS[aggregateOperator]})` : ""); } - getReportMeasures() { - return computeReportMeasures(this.metaData.fields, this.metaData.fieldAttrs, []); - } - //-------------------------------------------------------------------------- // Cell missing //--------------------------------------------------------------------------