Skip to content

Commit

Permalink
Merge PR OCA#3027 into 18.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Dec 20, 2024
2 parents ef30c37 + f288f58 commit 464bb1a
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/** @odoo-module **/
/* Copyright 2022 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */

Expand Down
1 change: 0 additions & 1 deletion web_pivot_computed_measure/static/src/helpers/utils.esm.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/** @odoo-module **/
/* Copyright 2023 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/** @odoo-module **/
/* Copyright 2024 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/** @odoo-module **/
/* Copyright 2020 Tecnativa - Alexandre Díaz
* Copyright 2022 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */

import {PivotModel} from "@web/views/pivot/pivot_model";
import {patch} from "@web/core/utils/patch";
import {computeReportMeasures} from "@web/views/utils";
import {evalOperation} from "../helpers/utils.esm";
import {patch} from "@web/core/utils/patch";

patch(PivotModel.prototype, {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/** @odoo-module **/
/* Copyright 2022 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/** @odoo-module **/
/* Copyright 2024 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */

import {ReportViewMeasures} from "@web/views/view_components/report_view_measures";
import {DropdownItemCustomMeasure} from "../dropdown_item_custom_measure/dropdown_item_custom_measure.esm";
import {ReportViewMeasures} from "@web/views/view_components/report_view_measures";

ReportViewMeasures.components = {
...ReportViewMeasures.components,
Expand Down
1 change: 0 additions & 1 deletion web_pivot_computed_measure/static/src/test/test.esm.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/** @odoo-module **/
/* Copyright 2022 Tecnativa - Carlos Roca
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/** @odoo-module **/

import {ListRenderer} from "@web/views/list/list_renderer";
import {evaluateBooleanExpr} from "@web/core/py_js/py";
import {patch} from "@web/core/utils/patch";
Expand Down

0 comments on commit 464bb1a

Please sign in to comment.