From deaae51fb5af1d0ed68c2caf0860d116f5679c16 Mon Sep 17 00:00:00 2001 From: Pierre Paridans Date: Fri, 5 Aug 2022 12:59:36 +0000 Subject: [PATCH] [FIX] web: reorder assets as webclient/* defines base elements for views `webclient/*` defines the main infrastructure for views and as such also global components/utilities (like Odoo Icons variables/utility classes). But, as the `views/*` are included *before* `webclient/*`, they can't use SCSS variables defined in `webclient/*`. This commit fixes it by interverting their order, which has a significant effect on the SCSS output, but not the JavaScript (as the modules system is responsible of the imports order, not the bundler). Part-of: odoo/odoo#97562 --- addons/web/__manifest__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index 11c287a3e5a..600c69ef77a 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -97,11 +97,11 @@ This module provides the core of the Odoo Web Client. 'web/static/src/core/**/*', 'web/static/src/legacy/legacy_fields.scss', 'web/static/src/search/**/*', - 'web/static/src/views/**/*', - ('remove', 'web/static/src/views/form/button_box/*.scss'), 'web/static/src/webclient/**/*', ('remove', 'web/static/src/webclient/navbar/navbar.scss'), # already in _assets_common_styles ('remove', 'web/static/src/webclient/clickbot/clickbot.js'), # lazy loaded + 'web/static/src/views/**/*', + ('remove', 'web/static/src/views/form/button_box/*.scss'), 'web/static/src/env.js', 'web/static/lib/jquery.scrollTo/jquery.scrollTo.js',