diff --git a/web_time_range_menu_custom/__manifest__.py b/web_time_range_menu_custom/__manifest__.py index 7f5e6bc10..666572dec 100644 --- a/web_time_range_menu_custom/__manifest__.py +++ b/web_time_range_menu_custom/__manifest__.py @@ -2,7 +2,7 @@ { "name": "Web Time Range Menu Custom", - "version": "16.0.1.0.0", + "version": "17.0.1.0.0", "author": "Tecnativa, Odoo Community Association (OCA)", "license": "AGPL-3", "website": "https://github.com/OCA/web", @@ -11,7 +11,11 @@ "auto_install": False, "assets": { "web.assets_backend": [ - "/web_time_range_menu_custom/static/src/js/*.esm.js", + ( + "after", + "/web/static/src/search/utils/dates.js", + "/web_time_range_menu_custom/static/src/js/*.esm.js", + ), "/web_time_range_menu_custom/static/src/scss/*.scss", "/web_time_range_menu_custom/static/src/xml/*.xml", ], diff --git a/web_time_range_menu_custom/static/src/js/comparison_menu.esm.js b/web_time_range_menu_custom/static/src/js/comparison_menu.esm.js deleted file mode 100644 index d6dcb0b98..000000000 --- a/web_time_range_menu_custom/static/src/js/comparison_menu.esm.js +++ /dev/null @@ -1,13 +0,0 @@ -/** @odoo-module **/ -/* Copyright 2024 Tecnativa - Carlos Roca - * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */ -import {ComparisonMenu} from "@web/search/comparison_menu/comparison_menu"; -import {DropdownItemCustomPeriod} from "./date_selector.esm"; -import {patch} from "@web/core/utils/patch"; - -patch(ComparisonMenu, "web_time_range_menu_custom.FilterMenu", { - components: { - ...ComparisonMenu.components, - DropdownItemCustomPeriod, - }, -}); diff --git a/web_time_range_menu_custom/static/src/js/dates.esm.js b/web_time_range_menu_custom/static/src/js/dates.esm.js index f5be25fd6..ae52d99cd 100644 --- a/web_time_range_menu_custom/static/src/js/dates.esm.js +++ b/web_time_range_menu_custom/static/src/js/dates.esm.js @@ -40,7 +40,7 @@ Object.assign(dates.PER_YEAR, { const _getSetParam = dates.getSetParam; // Patch of functions defined before -patch(dates, "patch dates", { +patch(dates, { /* * Redefine function to avoid the exclusion of days and weeks. */ diff --git a/web_time_range_menu_custom/static/src/js/filter_menu.esm.js b/web_time_range_menu_custom/static/src/js/search_bar_menu.esm.js similarity index 56% rename from web_time_range_menu_custom/static/src/js/filter_menu.esm.js rename to web_time_range_menu_custom/static/src/js/search_bar_menu.esm.js index c0999ca09..45c5f894e 100644 --- a/web_time_range_menu_custom/static/src/js/filter_menu.esm.js +++ b/web_time_range_menu_custom/static/src/js/search_bar_menu.esm.js @@ -1,13 +1,13 @@ /** @odoo-module **/ -/* Copyright 2024 Tecnativa - Carlos Roca +/* Copyright 2022 Tecnativa - Carlos Roca * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) */ -import {FilterMenu} from "@web/search/filter_menu/filter_menu"; -import {DropdownItemCustomPeriod} from "./date_selector.esm"; import {patch} from "@web/core/utils/patch"; +import {SearchBarMenu} from "@web/search/search_bar_menu/search_bar_menu"; +import {DropdownItemCustomPeriod} from "./date_selector.esm"; -patch(FilterMenu, "web_time_range_menu_custom.FilterMenu", { +patch(SearchBarMenu, { components: { - ...FilterMenu.components, + ...SearchBarMenu.components, DropdownItemCustomPeriod, }, }); diff --git a/web_time_range_menu_custom/static/src/xml/comparison_menu.xml b/web_time_range_menu_custom/static/src/xml/comparison_menu.xml deleted file mode 100644 index e867032db..000000000 --- a/web_time_range_menu_custom/static/src/xml/comparison_menu.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/web_time_range_menu_custom/static/src/xml/date_selector.xml b/web_time_range_menu_custom/static/src/xml/date_selector.xml index 5179ef839..26875841e 100644 --- a/web_time_range_menu_custom/static/src/xml/date_selector.xml +++ b/web_time_range_menu_custom/static/src/xml/date_selector.xml @@ -1,7 +1,7 @@ - +